Remove unused button color ids

New button state color ids were introduced as part of http://crrev.com/c/2042376. Their usage was later removed due to feedback, but they were left in. This change removes them. Change-Id: I0317c22f068e4823f957d51f3a09388a04ee7be7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2048284 Commit-Queue: Peter Kasting <pkasting@chromium.org> Reviewed-by: Peter Kasting <pkasting@chromium.org> Cr-Commit-Position: refs/heads/master@{#740016}
marcosholgado · Feb 10, 2020 · dfb101e · dfb101e
1 parent c054e3c
commit dfb101e
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 15 deletions.
diff --git a/chrome/browser/ui/gtk/native_theme_gtk.cc b/chrome/browser/ui/gtk/native_theme_gtk.cc
@@ -194,8 +194,6 @@ base::Optional<SkColor> SkColorFromColorId(
 
     // Button
     case ui::NativeTheme::kColorId_ButtonEnabledColor:
-    case ui::NativeTheme::kColorId_ButtonHoveredColor:
-    case ui::NativeTheme::kColorId_ButtonPressedColor:
     case ui::NativeTheme::kColorId_ButtonUncheckedColor:
       return GetFgColor("GtkButton#button.text-button GtkLabel");
     case ui::NativeTheme::kColorId_ButtonDisabledColor:

diff --git a/ui/color/color_id.h b/ui/color/color_id.h
@@ -41,8 +41,6 @@
   E(kColorButtonBorder, NativeTheme::kColorId_ButtonBorderColor) \
   E(kColorButtonDisabledForeground, NativeTheme::kColorId_ButtonDisabledColor) \
   E(kColorButtonForeground, NativeTheme::kColorId_ButtonEnabledColor) \
-  E(kColorButtonHoveredForeground, NativeTheme::kColorId_ButtonHoveredColor) \
-  E(kColorButtonPressedForeground, NativeTheme::kColorId_ButtonPressedColor) \
   /* TODO(https://crbug.com/1003612): Map this to old color id. */ \
   E_CPONLY(kColorButtonPressedBackground) \
   E(kColorButtonProminentBackground, \

diff --git a/ui/color/ui_color_mixer.cc b/ui/color/ui_color_mixer.cc
@@ -21,8 +21,6 @@ void AddUiColorMixers(ColorProvider* provider) {
   mixer[kColorButtonBorder] = {kColorBorderAndSeparatorForeground};
   mixer[kColorButtonDisabledForeground] = {kColorDisabledForeground};
   mixer[kColorButtonForeground] = {kColorAccent};
-  mixer[kColorButtonHoveredForeground] = {kColorButtonForeground};
-  mixer[kColorButtonPressedForeground] = {kColorButtonForeground};
   mixer[kColorButtonPressedBackground] = {kColorButtonBackground};
   mixer[kColorButtonProminentBackground] = {kColorAccent};
   mixer[kColorButtonProminentDisabledBackground] =

diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc
@@ -69,8 +69,6 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
       case NativeTheme::kColorId_ButtonBorderColor:
         return gfx::kGoogleGrey800;
       case NativeTheme::kColorId_ButtonEnabledColor:
-      case NativeTheme::kColorId_ButtonHoveredColor:
-      case NativeTheme::kColorId_ButtonPressedColor:
       case NativeTheme::kColorId_ProminentButtonColor:
         return gfx::kGoogleBlue300;
       case NativeTheme::kColorId_ButtonHoverColor:
@@ -206,8 +204,6 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
 
     // Buttons
     case NativeTheme::kColorId_ButtonEnabledColor:
-    case NativeTheme::kColorId_ButtonHoveredColor:
-    case NativeTheme::kColorId_ButtonPressedColor:
       return gfx::kGoogleBlue600;
     case NativeTheme::kColorId_ButtonInkDropShadowColor:
       return SkColorSetA(SK_ColorBLACK, 0x1A);

diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
@@ -334,9 +334,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
     kColorId_ButtonBorderColor,
     kColorId_ButtonEnabledColor,
     kColorId_ButtonDisabledColor,
-    kColorId_ButtonHoverColor,    // background
-    kColorId_ButtonHoveredColor,  // foreground
-    kColorId_ButtonPressedColor,
+    kColorId_ButtonHoverColor,
     kColorId_ButtonInkDropFillColor,
     kColorId_ButtonInkDropShadowColor,
     kColorId_ButtonPressedShade,

diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
@@ -657,8 +657,6 @@ SkColor NativeThemeWin::GetPlatformHighContrastColor(ColorId color_id) const {
       return system_colors_[SystemThemeColor::kHighlight];
 
     // Highlight/Selected Text Foreground
-    case kColorId_ButtonHoveredColor:
-    case kColorId_ButtonPressedColor:
     case kColorId_TextOnProminentButtonColor:
     case kColorId_SelectedMenuItemForegroundColor:
     case kColorId_TextfieldSelectionColor: