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 6962a704f3c471b2ab3b81b3f18d8f4f82d4c672..1f757dd1cbe0863f4168fb7714bf091e3978e24f 100644 |
--- a/ui/native_theme/native_theme_mac.mm |
+++ b/ui/native_theme/native_theme_mac.mm |
@@ -139,10 +139,15 @@ SkColor NativeThemeMac::GetSystemColor(ColorId color_id) const { |
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
|
+ ? 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: |
@@ -155,7 +160,9 @@ SkColor NativeThemeMac::GetSystemColor(ColorId color_id) const { |
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]); |