Index: ui/native_theme/native_theme_dark_aura.cc |
diff --git a/ui/native_theme/native_theme_dark_aura.cc b/ui/native_theme/native_theme_dark_aura.cc |
index 1fb481465a6c9480b0f61a81c0116d4fe759dd24..2e1973fa8a24e331f576e9e491a974a16508ee79 100644 |
--- a/ui/native_theme/native_theme_dark_aura.cc |
+++ b/ui/native_theme/native_theme_dark_aura.cc |
@@ -18,8 +18,11 @@ SkColor NativeThemeDarkAura::GetSystemColor(ColorId color_id) const { |
if (!ui::MaterialDesignController::IsModeMaterial()) |
return NativeThemeAura::GetSystemColor(color_id); |
+ static const SkColor kPrimaryTextColor = SK_ColorWHITE; |
+ static const SkColor kDisabledTextColor = SkColorSetA(SK_ColorWHITE, 0x61); |
+ static const SkColor kDefaultDarkBackground = SkColorSetRGB(0x3C, 0x3C, 0x3E); |
+ |
static const SkColor kButtonEnabledColor = SK_ColorWHITE; |
- static const SkColor kLinkEnabledColor = gfx::kGoogleBlue300; |
static const SkColor kTextfieldDefaultColor = SK_ColorWHITE; |
static const SkColor kTextfieldDefaultBackground = |
@@ -38,12 +41,20 @@ SkColor NativeThemeDarkAura::GetSystemColor(ColorId color_id) const { |
case kColorId_ButtonEnabledColor: |
return kButtonEnabledColor; |
case kColorId_CallToActionColor: |
- return kLinkEnabledColor; |
+ return gfx::kGoogleBlue300; |
+ |
+ // Label |
+ case kColorId_LabelEnabledColor: |
+ return kPrimaryTextColor; |
+ case kColorId_LabelDisabledColor: |
+ return kDisabledTextColor; |
+ case kColorId_LabelBackgroundColor: |
+ return kDefaultDarkBackground; |
// Link |
case kColorId_LinkEnabled: |
case kColorId_LinkPressed: |
- return kLinkEnabledColor; |
+ return gfx::kGoogleBlue300; |
// Textfield |
case kColorId_TextfieldDefaultColor: |
@@ -106,9 +117,6 @@ SkColor NativeThemeDarkAura::GetSystemColor(ColorId color_id) const { |
case kColorId_EnabledMenuButtonBorderColor: |
case kColorId_FocusedMenuButtonBorderColor: |
case kColorId_HoverMenuButtonBorderColor: |
- case kColorId_LabelEnabledColor: |
- case kColorId_LabelDisabledColor: |
- case kColorId_LabelBackgroundColor: |
case kColorId_LinkDisabled: |
case kColorId_TextfieldReadOnlyColor: |
case kColorId_TextfieldReadOnlyBackground: |