macviews: always use Aura colors when --secondary-ui-md

ui/native_theme/native_theme_mac.mm

Index: ui/native_theme/native_theme_mac.mm
diff --git a/ui/native_theme/native_theme_mac.mm b/ui/native_theme/native_theme_mac.mm
index 1960780c25bb56abfa549dca114d35fdceec52aa..87bf24e608e144276b010d5ab5699b8efc2b6a21 100644
--- a/ui/native_theme/native_theme_mac.mm
+++ b/ui/native_theme/native_theme_mac.mm
@@ -126,28 +126,25 @@ SkColor ColorToGrayscale(SkColor color) {
 }
 
 SkColor NativeThemeMac::GetSystemColor(ColorId color_id) const {
+  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 ui::MaterialDesignController::IsSecondaryUiMaterial()
-                ? GetAuraColorWithSystemTint(color_id, this)
-                : kDialogBackgroundColor;
+      return kDialogBackgroundColor;
     case kColorId_BubbleBackground:
       return SK_ColorWHITE;
 
     case kColorId_FocusedBorderColor:
-      return ui::MaterialDesignController::IsSecondaryUiMaterial()
-                ? GetAuraColorWithSystemTint(color_id, this)
-                : NSSystemColorToSkColor([NSColor keyboardFocusIndicatorColor]);
+      return NSSystemColorToSkColor([NSColor keyboardFocusIndicatorColor]);
     case kColorId_FocusedMenuButtonBorderColor:
       return NSSystemColorToSkColor([NSColor keyboardFocusIndicatorColor]);
     case kColorId_UnfocusedBorderColor:
-      return ui::MaterialDesignController::IsSecondaryUiMaterial()
-                ? GetAuraColorWithSystemTint(color_id, this)
-                : NSSystemColorToSkColor([NSColor controlColor]);
+      return NSSystemColorToSkColor([NSColor controlColor]);
 
     // Buttons and labels.
     case kColorId_ButtonBackgroundColor:
@@ -158,11 +155,8 @@ SkColor ColorToGrayscale(SkColor color) {
     case kColorId_ButtonEnabledColor:
     case kColorId_EnabledMenuButtonBorderColor:
     case kColorId_LabelEnabledColor:
-      return NSSystemColorToSkColor([NSColor controlTextColor]);
     case kColorId_CallToActionColor:
-      return ui::MaterialDesignController::IsSecondaryUiMaterial()
-                ? GetAuraColorWithSystemTint(color_id, this)
-                : NSSystemColorToSkColor([NSColor controlTextColor]);
+      return NSSystemColorToSkColor([NSColor controlTextColor]);
     case kColorId_ButtonDisabledColor:
     case kColorId_LabelDisabledColor:
       return NSSystemColorToSkColor([NSColor disabledControlTextColor]);
@@ -427,12 +421,6 @@ SkColor ColorToGrayscale(SkColor color) {
   canvas->drawDRRect(outer_shape, shape, paint);
 }
 
-SkColor NativeThemeMac::GetAuraColorWithSystemTint(
-    NativeTheme::ColorId color_id,
-    const NativeTheme* base_theme) const {
-  return ApplySystemControlTint(GetAuraColor(color_id, base_theme));
-}
-
 NativeThemeMac::NativeThemeMac() {
 }