views: use cross-platform border colors

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 121 matching lines @@
     case kColorId_WindowBackground:
       return NSSystemColorToSkColor([NSColor windowBackgroundColor]);
     case kColorId_DialogBackground:
       return ui::MaterialDesignController::IsSecondaryUiMaterial()
                 ? GetAuraColor(color_id, this)
                 : kDialogBackgroundColor;
     case kColorId_BubbleBackground:
       return SK_ColorWHITE;
 
     case kColorId_FocusedBorderColor:
+      return ui::MaterialDesignController::IsSecondaryUiMaterial()

[Evan Stade, 2016/08/30 16:09:54]

seems perhaps worth separating this out, a la:

if (IsSecondaryUiMaterial()) {
  switch(color_id) {
    case foo:
    case bag:
    case bar:
      return GetAuraColor(color_id, this);
  }
}

When that clause becomes always true, we can just move the body into the
existing switch.

But, up to you.

+                ? GetAuraColor(color_id, this)
+                : NSSystemColorToSkColor([NSColor keyboardFocusIndicatorColor]);
     case kColorId_FocusedMenuButtonBorderColor:
       return NSSystemColorToSkColor([NSColor keyboardFocusIndicatorColor]);
     case kColorId_UnfocusedBorderColor:
-      return NSSystemColorToSkColor([NSColor controlColor]);
+      return ui::MaterialDesignController::IsSecondaryUiMaterial()
+                ? GetAuraColor(color_id, this)
+                : 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:
       return NSSystemColorToSkColor([NSColor controlTextColor]);
     case kColorId_CallToActionColor:
-      return NSSystemColorToSkColor([NSColor controlTextColor]);
+      return ui::MaterialDesignController::IsSecondaryUiMaterial()
+                ? GetAuraColor(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]);
@@ skipping 251 matching lines @@
   canvas->drawDRRect(outer_shape, shape, paint);
 }
 
 NativeThemeMac::NativeThemeMac() {
 }
 
 NativeThemeMac::~NativeThemeMac() {
 }
 
 }  // namespace ui