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

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 {
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial())
+    return GetAuraColorWithSystemTint(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:
     case kColorId_ButtonHoverBackgroundColor:
     case kColorId_HoverMenuButtonBorderColor:
     case kColorId_LabelBackgroundColor:
       return NSSystemColorToSkColor([NSColor controlBackgroundColor]);
     case kColorId_ButtonEnabledColor:
     case kColorId_EnabledMenuButtonBorderColor:
     case kColorId_LabelEnabledColor:
+    case kColorId_CallToActionColor:
       return NSSystemColorToSkColor([NSColor controlTextColor]);
-    case kColorId_CallToActionColor:
-      return ui::MaterialDesignController::IsSecondaryUiMaterial()
-                ? GetAuraColorWithSystemTint(color_id, this)
-                : NSSystemColorToSkColor([NSColor controlTextColor]);
     case kColorId_ButtonDisabledColor:
     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.

[Evan Stade, 2016/09/01 20:31:30]

I suspect (but don't know for a fact) menus are going to stay the same, i.e.
platform-dependent, so maybe keep this part of the switch and fall back to the
aura color for things not handled in the switch?

[Elly Fong-Jones, 2016/09/02 11:34:42]

Hm. I changed this because the Harmony spec sheets have a page
"SPEC-secondary-UI-settings-menu" which seems to define the appearance of menus
in detail. Does that only apply to the settings menu? I actually have no idea
what the story is going to be for other menus; we've been using NSMenu on Mac,
certainly.

[Evan Stade, 2016/09/06 16:58:33]

That might just be included for completeness. It's probably something we should
discuss with bettes et al.

     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]);
@@ skipping 235 matching lines @@
   SkRRect outer_shape;
   shape.outset(kFocusRingThickness, kFocusRingThickness, &outer_shape);
   paint.setShader(nullptr);
   paint.setColor(kFocusRingColor);
   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));

[Evan Stade, 2016/09/01 20:31:30]

seems like this should be inlined now that there's only one callsite

[Elly Fong-Jones, 2016/09/02 11:34:42]

Well-spotted, deleted.

 }
 
 NativeThemeMac::NativeThemeMac() {
 }
 
 NativeThemeMac::~NativeThemeMac() {
 }
 
 }  // namespace ui