Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(415)

Unified Diff: ui/native_theme/native_theme_dark_aura.cc

Issue 2346893002: Share a common alpha value used for displaying disabled state in Harmony (Closed)
Patch Set: compiling is underrated Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/native_theme/common_theme.cc ('k') | ui/views/controls/button/md_text_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 164a909f1661050e7a510d4be3899189bef6501f..305388e0f72917c653ac8490644c13a88db9627b 100644
--- a/ui/native_theme/native_theme_dark_aura.cc
+++ b/ui/native_theme/native_theme_dark_aura.cc
@@ -19,7 +19,6 @@ SkColor NativeThemeDarkAura::GetSystemColor(ColorId color_id) const {
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;
@@ -46,8 +45,6 @@ SkColor NativeThemeDarkAura::GetSystemColor(ColorId color_id) const {
// Label
case kColorId_LabelEnabledColor:
return kPrimaryTextColor;
- case kColorId_LabelDisabledColor:
- return kDisabledTextColor;
case kColorId_LabelBackgroundColor:
return kDefaultDarkBackground;
@@ -90,6 +87,7 @@ SkColor NativeThemeDarkAura::GetSystemColor(ColorId color_id) const {
return gfx::kGoogleRed300;
// Intentional pass-throughs to NativeThemeAura.
+ case kColorId_LabelDisabledColor:
case kColorId_TextOnCallToActionColor:
case kColorId_ButtonPressedShade:
case kColorId_ResultsTableHoveredBackground:
« no previous file with comments | « ui/native_theme/common_theme.cc ('k') | ui/views/controls/button/md_text_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698