Removed hardcoded colors from control menus.

Removed references to hardcoded values for all control menu
components and piped color access through native theme. Added
appropriate color ids and native theme values for relevant platforms.

Bug: 1003612
Change-Id: I013fed6425a8d74cd59288ef77898dd835e58d34
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1949105Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Thomas Lukaszewicz <tluk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721489}

chrome/browser/ui/libgtkui/native_theme_gtk.cc

@@ -104,6 +104,7 @@ SkColor SkColorFromColorId(ui::NativeTheme::ColorId color_id) {
     case ui::NativeTheme::kColorId_FocusedMenuItemBackgroundColor:
       return GetBgColor("GtkMenu#menu GtkMenuItem#menuitem:hover");
     case ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor:
+    case ui::NativeTheme::kColorId_MenuDropIndicator:
       return GetFgColor("GtkMenu#menu GtkMenuItem#menuitem GtkLabel");
     case ui::NativeTheme::kColorId_SelectedMenuItemForegroundColor:
       return GetFgColor("GtkMenu#menu GtkMenuItem#menuitem:hover GtkLabel");

ui/native_theme/common_theme.cc

@@ -79,6 +79,7 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
       case NativeTheme::kColorId_EnabledMenuItemForegroundColor:
       case NativeTheme::kColorId_SelectedMenuItemForegroundColor:
       case NativeTheme::kColorId_HighlightedMenuItemForegroundColor:
+      case NativeTheme::kColorId_MenuDropIndicator:
         return gfx::kGoogleGrey200;
       case NativeTheme::kColorId_MenuBorderColor:
       case NativeTheme::kColorId_MenuSeparatorColor:
@@ -223,6 +224,7 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
     case NativeTheme::kColorId_EnabledMenuItemForegroundColor:
     case NativeTheme::kColorId_SelectedMenuItemForegroundColor:
     case NativeTheme::kColorId_HighlightedMenuItemForegroundColor:
+    case NativeTheme::kColorId_MenuDropIndicator:
       return kPrimaryTextColor;
     case NativeTheme::kColorId_FocusedMenuItemBackgroundColor: {
       const SkColor bg = base_theme->GetSystemColor(

ui/native_theme/native_theme.h

@@ -338,6 +338,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
     kColorId_DisabledMenuItemForegroundColor,
     kColorId_SelectedMenuItemForegroundColor,
     kColorId_FocusedMenuItemBackgroundColor,
+    kColorId_MenuDropIndicator,
     kColorId_MenuItemMinorTextColor,
     kColorId_MenuSeparatorColor,
     kColorId_MenuBackgroundColor,

ui/views/controls/menu/menu_scroll_view_container.cc

@@ -302,8 +302,9 @@ void MenuScrollViewContainer::CreateDefaultBorder() {
 }
 
 void MenuScrollViewContainer::CreateBubbleBorder() {
-  bubble_border_ =
-      new BubbleBorder(arrow_, BubbleBorder::SMALL_SHADOW, SK_ColorWHITE);
+  const SkColor color = GetNativeTheme()->GetSystemColor(
+      ui::NativeTheme::kColorId_MenuBorderColor);
+  bubble_border_ = new BubbleBorder(arrow_, BubbleBorder::SMALL_SHADOW, color);
   if (content_view_->GetMenuItem()
           ->GetMenuController()
           ->use_touchable_layout()) {

ui/views/controls/menu/submenu_view.cc

@@ -28,9 +28,6 @@ namespace {
 // Height of the drop indicator. This should be an even number.
 constexpr int kDropIndicatorHeight = 2;
 
-// Color of the drop indicator.
-constexpr SkColor kDropIndicatorColor = SK_ColorBLACK;
-
 }  // namespace
 
 namespace views {
@@ -228,7 +225,9 @@ void SubmenuView::PaintChildren(const PaintInfo& paint_info) {
   if (paint_drop_indicator) {
     gfx::Rect bounds = CalculateDropIndicatorBounds(drop_item_, drop_position_);
     ui::PaintRecorder recorder(paint_info.context(), size());
-    recorder.canvas()->FillRect(bounds, kDropIndicatorColor);
+    const SkColor drop_indicator_color = GetNativeTheme()->GetSystemColor(
+        ui::NativeTheme::kColorId_MenuDropIndicator);
+    recorder.canvas()->FillRect(bounds, drop_indicator_color);
   }
 }