Remove 10.13, 10.14 support from theming

These macOS releases are no longer supported by Chromium. Bug: 1410851 Change-Id: I92de1d7adc0eec4c36a561c9ac0cc144133757f1 Include-Ci-Only-Tests: true Cq-Include-Trybots: luci.chrome.try:mac-chrome Validate-Test-Flakiness: skip Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4633980 Reviewed-by: Jamie Walch <jamiewalch@chromium.org> Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com> Reviewed-by: Chris Harrelson <chrishtr@chromium.org> Reviewed-by: Leonard Grey <lgrey@chromium.org> Auto-Submit: Avi Drissman <avi@chromium.org> Commit-Queue: Jamie Walch <jamiewalch@chromium.org> Cr-Commit-Position: refs/heads/main@{#1161986}
qweri0p · Jun 23, 2023 · de64ad2 · de64ad2
1 parent 600f2f9
commit de64ad2
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 114 deletions.
diff --git a/chrome/browser/focus_ring_browsertest.cc b/chrome/browser/focus_ring_browsertest.cc
@@ -7,7 +7,6 @@
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
 #include "cc/test/pixel_comparator.h"
-#include "chrome/browser/focus_ring_browsertest_mac.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ -201,8 +200,6 @@ IN_PROC_BROWSER_TEST_F(FocusRingBrowserTest, MAYBE_Anchor) {
 #endif
 IN_PROC_BROWSER_TEST_F(FocusRingBrowserTest, MAYBE_DarkModeButton) {
 #if BUILDFLAG(IS_MAC)
-  if (!MacOSVersionSupportsDarkMode())
-    return;
   auto comparator = mac_strict_comparator;
 #else
   cc::AlphaDiscardingExactPixelComparator comparator;

diff --git a/chrome/browser/focus_ring_browsertest_mac.h b/chrome/browser/focus_ring_browsertest_mac.h
diff --git a/chrome/browser/focus_ring_browsertest_mac.mm b/chrome/browser/focus_ring_browsertest_mac.mm
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
@@ -10476,8 +10476,6 @@ if (!is_android) {
 
     if (is_mac) {
       sources += [
-        "../browser/focus_ring_browsertest_mac.h",
-        "../browser/focus_ring_browsertest_mac.mm",
         "../browser/global_keyboard_shortcuts_interactive_uitest_mac.mm",
         "../browser/notifications/notification_interactive_uitest_mac.mm",
         "../browser/spellchecker/spellcheck_mac_view_interactive_uitest.mm",

diff --git a/content/browser/form_controls_browsertest.cc b/content/browser/form_controls_browsertest.cc
@@ -7,7 +7,6 @@
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
 #include "cc/test/pixel_comparator.h"
-#include "content/browser/form_controls_browsertest_mac.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
@@ -191,11 +190,6 @@ IN_PROC_BROWSER_TEST_F(FormControlsBrowserTest, Radio) {
 #define MAYBE_DarkModeTextSelection DarkModeTextSelection
 #endif
 IN_PROC_BROWSER_TEST_F(FormControlsBrowserTest, MAYBE_DarkModeTextSelection) {
-#if BUILDFLAG(IS_MAC)
-  if (!MacOSVersionSupportsDarkMode())
-    return;
-#endif
-
   if (SkipTestForOldAndroidVersions())
     return;
 

diff --git a/content/browser/form_controls_browsertest_mac.h b/content/browser/form_controls_browsertest_mac.h
diff --git a/content/browser/form_controls_browsertest_mac.mm b/content/browser/form_controls_browsertest_mac.mm
diff --git a/content/browser/theme_helper_mac.mm b/content/browser/theme_helper_mac.mm
@@ -313,24 +313,14 @@ - (void)notifyPrefsChangedWithRedraw:(BOOL)redraw {
         break;
       }
       case blink::MacSystemColorID::kControlAccentColor:
-        if (@available(macOS 10.14, *)) {
-          values[i] = NSColorToSkColor(NSColor.controlAccentColor);
-        } else {
-          // controlAccentColor property is not available before macOS 10.14,
-          // so keyboardFocusIndicatorColor is used instead.
-          values[i] = NSColorToSkColor(NSColor.keyboardFocusIndicatorColor);
-        }
+        values[i] = NSColorToSkColor(NSColor.controlAccentColor);
         break;
       case blink::MacSystemColorID::kKeyboardFocusIndicator:
         values[i] = NSColorToSkColor(NSColor.keyboardFocusIndicatorColor);
         break;
       case blink::MacSystemColorID::kSecondarySelectedControl:
-        if (@available(macOS 10.14, *)) {
-          values[i] = NSColorToSkColor(
-              NSColor.unemphasizedSelectedContentBackgroundColor);
-        } else {
-          values[i] = NSColorToSkColor(NSColor.secondarySelectedControlColor);
-        }
+        values[i] = NSColorToSkColor(
+            NSColor.unemphasizedSelectedContentBackgroundColor);
         break;
       case blink::MacSystemColorID::kSelectedTextBackground:
         values[i] = NSColorToSkColor(NSColor.selectedTextBackgroundColor);
@@ -360,7 +350,7 @@ - (void)notifyPrefsChangedWithRedraw:(BOOL)redraw {
               static_cast<size_t>(blink::MacSystemColorID::kCount),
               static_cast<size_t>(blink::MacSystemColorID::kCount)));
         }];
-  } else if (@available(macOS 10.14, *)) {
+  } else {
     NSAppearance* saved_appearance = NSAppearance.currentAppearance;
     NSAppearance.currentAppearance =
         [NSAppearance appearanceNamed:NSAppearanceNameAqua];
@@ -372,12 +362,6 @@ - (void)notifyPrefsChangedWithRedraw:(BOOL)redraw {
         values.subspan(static_cast<size_t>(blink::MacSystemColorID::kCount),
                        static_cast<size_t>(blink::MacSystemColorID::kCount)));
     NSAppearance.currentAppearance = saved_appearance;
-  } else {
-    LoadSystemColorsForCurrentAppearance(values.subspan(
-        0, static_cast<size_t>(blink::MacSystemColorID::kCount)));
-    LoadSystemColorsForCurrentAppearance(
-        values.subspan(static_cast<size_t>(blink::MacSystemColorID::kCount),
-                       static_cast<size_t>(blink::MacSystemColorID::kCount)));
   }
 }
 

diff --git a/content/renderer/theme_helper_mac.mm b/content/renderer/theme_helper_mac.mm
@@ -13,7 +13,7 @@
 #endif
 
 extern "C" {
-bool CGFontRenderingGetFontSmoothingDisabled(void) API_AVAILABLE(macos(10.14));
+bool CGFontRenderingGetFontSmoothingDisabled(void);
 }
 
 namespace content {
@@ -34,11 +34,8 @@ void SystemColorsDidChange(int aqua_color_variant) {
 }
 
 bool IsSubpixelAntialiasingAvailable() {
-  if (@available(macOS 10.14, *)) {
-    // See https://trac.webkit.org/changeset/239306/webkit for more info.
-    return !CGFontRenderingGetFontSmoothingDisabled();
-  }
-  return true;
+  // See https://trac.webkit.org/changeset/239306/webkit for more info.
+  return !CGFontRenderingGetFontSmoothingDisabled();
 }
 
 }  // namespace content
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
@@ -2037,8 +2037,6 @@ test("content_browsertests") {
       "../browser/accessibility/ax_tree_formatter_mac_browsertest.mm",
       "../browser/accessibility/browser_accessibility_cocoa_browsertest.mm",
       "../browser/accessibility/hit_testing_mac_browsertest.mm",
-      "../browser/form_controls_browsertest_mac.h",
-      "../browser/form_controls_browsertest_mac.mm",
       "../browser/gpu/browser_child_process_backgrounded_bridge_browsertest.mm",
       "../browser/keyboard_lock_browsertest_mac.mm",
       "../browser/pointer_lock_browsertest_mac.mm",

diff --git a/remoting/host/disconnect_window_mac.mm b/remoting/host/disconnect_window_mac.mm
@@ -36,14 +36,11 @@ - (void)hide;
 namespace {
 
 bool IsDarkMode() {
-  if (@available(macOS 10.14, *)) {
-    NSAppearanceName appearance =
-        [NSApp.effectiveAppearance bestMatchFromAppearancesWithNames:@[
-          NSAppearanceNameAqua, NSAppearanceNameDarkAqua
-        ]];
-    return [appearance isEqual:NSAppearanceNameDarkAqua];
-  }
-  return false;
+  NSAppearanceName appearance =
+      [NSApp.effectiveAppearance bestMatchFromAppearancesWithNames:@[
+        NSAppearanceNameAqua, NSAppearanceNameDarkAqua
+      ]];
+  return [appearance isEqual:NSAppearanceNameDarkAqua];
 }
 
 }  // namespace

diff --git a/third_party/blink/renderer/core/layout/layout_theme_mac.mm b/third_party/blink/renderer/core/layout/layout_theme_mac.mm
@@ -86,33 +86,19 @@ Color GetSystemColor(MacSystemColorID color_id,
 
 bool LayoutThemeMac::IsAccentColorCustomized(
     mojom::blink::ColorScheme color_scheme) const {
-  if (@available(macOS 10.14, *)) {
-    static const Color kControlBlueAccentColor =
-        GetSystemColor(MacSystemColorID::kControlAccentBlueColor, color_scheme);
-    if (kControlBlueAccentColor ==
-        GetSystemColor(MacSystemColorID::kControlAccentColor, color_scheme)) {
-      return false;
-    }
-  } else {
-    NSInteger user_custom_color = [[NSUserDefaults standardUserDefaults]
-        integerForKey:@"AppleAquaColorVariant"];
-    if (user_custom_color == NSBlueControlTint ||
-        user_custom_color == NSDefaultControlTint) {
-      return false;
-    }
+  static const Color kControlBlueAccentColor =
+      GetSystemColor(MacSystemColorID::kControlAccentBlueColor, color_scheme);
+  if (kControlBlueAccentColor ==
+      GetSystemColor(MacSystemColorID::kControlAccentColor, color_scheme)) {
+    return false;
   }
+
   return true;
 }
 
 Color LayoutThemeMac::GetSystemAccentColor(
     mojom::blink::ColorScheme color_scheme) const {
-  if (@available(macOS 10.14, *)) {
-    return GetSystemColor(MacSystemColorID::kControlAccentColor, color_scheme);
-  } else {
-    return Color::FromRGBA32(
-        static_cast<RGBA32>([[NSUserDefaults standardUserDefaults]
-            integerForKey:@"AppleAquaColorVariant"]));
-  }
+  return GetSystemColor(MacSystemColorID::kControlAccentColor, color_scheme);
 }
 
 Color LayoutThemeMac::GetCustomFocusRingColor(