Eliminate hardcoded SkColorSet* use from menu_item_view

Per guidance, this change splits the alert color from one color ID
into two and places the alpha values into the two of them.
Then this uses a color tween.

Bug: 1056950
Change-Id: I8e9f7c4e34ef90a684c2d6b651064e717a447eb3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2111472
Commit-Queue: Maria Villarreal <mavill@microsoft.com>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#752274}

chrome/browser/ui/gtk/native_theme_gtk.cc

@@ -101,7 +101,8 @@ base::Optional<SkColor> SkColorFromColorId(
     // Menu
     case ui::NativeTheme::kColorId_MenuBackgroundColor:
     case ui::NativeTheme::kColorId_HighlightedMenuItemBackgroundColor:
-    case ui::NativeTheme::kColorId_MenuItemAlertBackgroundColor:
+    case ui::NativeTheme::kColorId_MenuItemInitialAlertBackgroundColor:
+    case ui::NativeTheme::kColorId_MenuItemTargetAlertBackgroundColor:
       return GetBgColor("GtkMenu#menu");
     case ui::NativeTheme::kColorId_MenuBorderColor:
       return GetBorderColor("GtkMenu#menu");

ui/color/color_id.h

@@ -62,8 +62,10 @@
   E(kColorLinkPressedForeground, NativeTheme::kColorId_LinkPressed) \
   E(kColorMenuBackground, NativeTheme::kColorId_MenuBackgroundColor) \
   E(kColorMenuBorder, NativeTheme::kColorId_MenuBorderColor) \
-  E(kColorMenuItemAlertedBackground, \
-    NativeTheme::kColorId_MenuItemAlertBackgroundColor) \
+  E(kColorMenuItemBackgroundAlertedInitial, \
+    NativeTheme::kColorId_MenuItemInitialAlertBackgroundColor) \
+  E(kColorMenuItemBackgroundAlertedTarget, \
+    NativeTheme::kColorId_MenuItemTargetAlertBackgroundColor) \
   E(kColorMenuItemDisabledForeground, \
     NativeTheme::kColorId_DisabledMenuItemForegroundColor) \
   E(kColorMenuItemForeground, \

ui/color/ui_color_mixer.cc

@@ -45,7 +45,8 @@ void AddUiColorMixers(ColorProvider* provider) {
   mixer[kColorLinkForeground] = {kColorAccent};
   mixer[kColorMenuBackground] = {kColorPrimaryBackground};
   mixer[kColorMenuBorder] = {kColorBorderAndSeparatorForeground};
-  mixer[kColorMenuItemAlertedBackground] = {kColorAccent};
+  mixer[kColorMenuItemBackgroundAlertedInitial] = SetAlpha(kColorAccent, 0x4D);
+  mixer[kColorMenuItemBackgroundAlertedTarget] = SetAlpha(kColorAccent, 0x1A);
   mixer[kColorMenuItemDisabledForeground] = {kColorDisabledForeground};
   mixer[kColorMenuItemForeground] = {kColorPrimaryForeground};
   mixer[kColorMenuItemHighlightedBackground] = {kColorSubtleEmphasisBackground};

ui/native_theme/common_theme.cc

@@ -92,8 +92,10 @@ base::Optional<SkColor> GetDarkSchemeColor(NativeTheme::ColorId color_id) {
       return gfx::kGoogleGrey800;
     case NativeTheme::kColorId_HighlightedMenuItemBackgroundColor:
       return SkColorSetRGB(0x32, 0x36, 0x39);
-    case NativeTheme::kColorId_MenuItemAlertBackgroundColor:
-      return gfx::kGoogleBlue300;
+    case NativeTheme::kColorId_MenuItemInitialAlertBackgroundColor:
+      return SkColorSetA(gfx::kGoogleBlue300, 0x4D);
+    case NativeTheme::kColorId_MenuItemTargetAlertBackgroundColor:
+      return SkColorSetA(gfx::kGoogleBlue300, 0x1A);
     case NativeTheme::kColorId_MenuItemMinorTextColor:
       return gfx::kGoogleGrey500;
 
@@ -295,8 +297,10 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id,
       return gfx::kGoogleGrey700;
     case NativeTheme::kColorId_HighlightedMenuItemBackgroundColor:
       return gfx::kGoogleGrey050;
-    case NativeTheme::kColorId_MenuItemAlertBackgroundColor:
-      return gfx::kGoogleBlue600;
+    case NativeTheme::kColorId_MenuItemInitialAlertBackgroundColor:
+      return SkColorSetA(gfx::kGoogleBlue600, 0x4D);
+    case NativeTheme::kColorId_MenuItemTargetAlertBackgroundColor:
+      return SkColorSetA(gfx::kGoogleBlue600, 0x1A);
 
     // Dropdown
     case NativeTheme::kColorId_DropdownBackgroundColor:

ui/native_theme/native_theme.cc

@@ -70,8 +70,10 @@ NativeThemeColorIdToColorIdMap() {
           {NTCID::kColorId_LinkPressed, kColorLinkPressedForeground},
           {NTCID::kColorId_MenuBackgroundColor, kColorMenuBackground},
           {NTCID::kColorId_MenuBorderColor, kColorMenuBorder},
-          {NTCID::kColorId_MenuItemAlertBackgroundColor,
-           kColorMenuItemAlertedBackground},
+          {NTCID::kColorId_MenuItemInitialAlertBackgroundColor,
+           kColorMenuItemBackgroundAlertedInitial},
+          {NTCID::kColorId_MenuItemTargetAlertBackgroundColor,
+           kColorMenuItemBackgroundAlertedTarget},
           {NTCID::kColorId_DisabledMenuItemForegroundColor,
            kColorMenuItemDisabledForeground},
           {NTCID::kColorId_EnabledMenuItemForegroundColor,

ui/native_theme/native_theme_color_id.h

@@ -50,7 +50,8 @@
   OP(kColorId_MenuBorderColor),                                                \
   OP(kColorId_HighlightedMenuItemBackgroundColor),                             \
   OP(kColorId_HighlightedMenuItemForegroundColor),                             \
-  OP(kColorId_MenuItemAlertBackgroundColor),                                   \
+  OP(kColorId_MenuItemInitialAlertBackgroundColor),                            \
+  OP(kColorId_MenuItemTargetAlertBackgroundColor),                             \
   /* Dropdown */                                                               \
   OP(kColorId_DropdownBackgroundColor),                                        \
   OP(kColorId_DropdownForegroundColor),                                        \

ui/views/controls/menu/menu_item_view.cc

@@ -1016,10 +1016,13 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
               : ui::NativeTheme::kColorId_HighlightedMenuItemBackgroundColor;
       color = GetNativeTheme()->GetSystemColor(color_id);
     } else {
-      color = GetNativeTheme()->GetSystemColor(
-          ui::NativeTheme::kColorId_MenuItemAlertBackgroundColor);
       const auto* animation = GetMenuController()->GetAlertAnimation();
-      color = SkColorSetA(color, animation->CurrentValueBetween(0x4D, 0x1A));
+      color = gfx::Tween::ColorValueBetween(
+          animation->GetCurrentValue(),
+          GetNativeTheme()->GetSystemColor(
+              ui::NativeTheme::kColorId_MenuItemInitialAlertBackgroundColor),
+          GetNativeTheme()->GetSystemColor(
+              ui::NativeTheme::kColorId_MenuItemTargetAlertBackgroundColor));
     }
 
     DCHECK_NE(color, gfx::kPlaceholderColor);

ui/views/examples/native_theme_example.cc

@@ -103,8 +103,10 @@ std::unique_ptr<View> CreateAllColorsView() {
                  COLOR_LABEL_ARGS(kColorId_HighlightedMenuItemBackgroundColor));
   InsertColorRow(layout,
                  COLOR_LABEL_ARGS(kColorId_HighlightedMenuItemForegroundColor));
+  InsertColorRow(
+      layout, COLOR_LABEL_ARGS(kColorId_MenuItemInitialAlertBackgroundColor));
   InsertColorRow(layout,
-                 COLOR_LABEL_ARGS(kColorId_MenuItemAlertBackgroundColor));
+                 COLOR_LABEL_ARGS(kColorId_MenuItemTargetAlertBackgroundColor));
   InsertColorRow(layout, COLOR_LABEL_ARGS(kColorId_LabelEnabledColor));
   InsertColorRow(layout, COLOR_LABEL_ARGS(kColorId_LabelDisabledColor));
   InsertColorRow(layout, COLOR_LABEL_ARGS(kColorId_LabelSecondaryColor));