macviews: use platform colors for menus

ui/native_theme/native_theme_mac.mm

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/native_theme/native_theme_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
 #include "base/mac/mac_util.h"
@@ skipping 108 matching lines @@
 }
 
 // static
 SkColor NativeThemeMac::ApplySystemControlTint(SkColor color) {
   if ([NSColor currentControlTint] == NSGraphiteControlTint)
     return ColorToGrayscale(color);
   return color;
 }
 
 SkColor NativeThemeMac::GetSystemColor(ColorId color_id) const {
+  // Even with --secondary-ui-md, menus use the platform colors and styling.
+  switch (color_id) {
+    case kColorId_EnabledMenuItemForegroundColor:
+      return NSSystemColorToSkColor([NSColor controlTextColor]);
+    case kColorId_DisabledMenuItemForegroundColor:
+    case kColorId_DisabledEmphasizedMenuItemForegroundColor:
+      return NSSystemColorToSkColor([NSColor disabledControlTextColor]);
+    case kColorId_SelectedMenuItemForegroundColor:
+      return NSSystemColorToSkColor([NSColor selectedMenuItemTextColor]);
+    case kColorId_FocusedMenuItemBackgroundColor:
+    case kColorId_HoverMenuItemBackgroundColor:
+      return NSSystemColorToSkColor([NSColor selectedMenuItemColor]);
+    case kColorId_MenuBackgroundColor:
+      return kMenuPopupBackgroundColor;
+    case kColorId_MenuSeparatorColor:
+      return base::mac::IsOS10_9() ? kMenuSeparatorColorMavericks
+                                   : kMenuSeparatorColor;
+    case kColorId_MenuBorderColor:
+      return kMenuBorderColor;
+    default:
+      break;
+  }
+
   if (ui::MaterialDesignController::IsSecondaryUiMaterial())
     return ApplySystemControlTint(GetAuraColor(color_id, this));
 
   // TODO(tapted): Add caching for these, and listen for
   // NSSystemColorsDidChangeNotification.
   switch (color_id) {
     case kColorId_WindowBackground:
       return NSSystemColorToSkColor([NSColor windowBackgroundColor]);
     case kColorId_DialogBackground:
       return kDialogBackgroundColor;
@@ skipping 22 matching lines @@
     case kColorId_LabelDisabledColor:
       return NSSystemColorToSkColor([NSColor disabledControlTextColor]);
     case kColorId_ButtonHighlightColor:
       // Although the NSColor documentation names "selectedControlTextColor" as
       // the color for a "text in a .. control being clicked or dragged", it
       // remains black, and text on Yosemite-style pressed buttons is white.
       return SK_ColorWHITE;
     case kColorId_ButtonHoverColor:
       return NSSystemColorToSkColor([NSColor selectedControlTextColor]);
 
-    // Menus.
-    case kColorId_EnabledMenuItemForegroundColor:
-      return NSSystemColorToSkColor([NSColor controlTextColor]);
-    case kColorId_DisabledMenuItemForegroundColor:
-    case kColorId_DisabledEmphasizedMenuItemForegroundColor:
-      return NSSystemColorToSkColor([NSColor disabledControlTextColor]);
-    case kColorId_SelectedMenuItemForegroundColor:
-      return NSSystemColorToSkColor([NSColor selectedMenuItemTextColor]);
-    case kColorId_FocusedMenuItemBackgroundColor:
-    case kColorId_HoverMenuItemBackgroundColor:
-      return NSSystemColorToSkColor([NSColor selectedMenuItemColor]);
-    case kColorId_MenuBackgroundColor:
-      return kMenuPopupBackgroundColor;
-    case kColorId_MenuSeparatorColor:
-      return base::mac::IsOS10_9() ? kMenuSeparatorColorMavericks
-                                   : kMenuSeparatorColor;
-    case kColorId_MenuBorderColor:
-      return kMenuBorderColor;
-
     // Link.
     case kColorId_LinkDisabled:
       return SK_ColorBLACK;
     case kColorId_LinkEnabled:
       return SK_ColorBLUE;
     case kColorId_LinkPressed:
       return SK_ColorRED;
 
     // Text fields.
     case kColorId_TextfieldDefaultColor:
@@ skipping 221 matching lines @@
   canvas->drawDRRect(outer_shape, shape, paint);
 }
 
 NativeThemeMac::NativeThemeMac() {
 }
 
 NativeThemeMac::~NativeThemeMac() {
 }
 
 }  // namespace ui