Commit 50b71f84 authored by ellyjones's avatar ellyjones Committed by Commit bot

views: use cross-platform border colors

As part of Harmony work, MacViews should switch from using Cocoa's color scheme
to Harmony's.

BUG=637016

Review-Url: https://codereview.chromium.org/2256323003
Cr-Commit-Position: refs/heads/master@{#415319}
parent 12ce31d0
......@@ -139,10 +139,15 @@ SkColor NativeThemeMac::GetSystemColor(ColorId color_id) const {
return SK_ColorWHITE;
case kColorId_FocusedBorderColor:
return ui::MaterialDesignController::IsSecondaryUiMaterial()
? 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]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment