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

Unified Diff: ui/native_theme/common_theme.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/gfx/color_palette.h ('k') | ui/native_theme/native_theme_dark_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/native_theme/common_theme.cc
diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc
index 4da91acea12919249415e4cf571cbdfa9b4eb434..71af8db44798ad6eb93d8815ce6e2b3ca8dde331 100644
--- a/ui/native_theme/common_theme.cc
+++ b/ui/native_theme/common_theme.cc
@@ -29,6 +29,10 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
// Labels
case NativeTheme::kColorId_LabelEnabledColor:
return kPrimaryTextColor;
+ case NativeTheme::kColorId_LabelDisabledColor:
+ return SkColorSetA(
+ base_theme->GetSystemColor(NativeTheme::kColorId_LabelEnabledColor),
+ gfx::kDisabledControlAlpha);
// FocusableBorder
case NativeTheme::kColorId_UnfocusedBorderColor:
@@ -41,7 +45,9 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
return base_theme->GetSystemColor(
NativeTheme::kColorId_DialogBackground);
case NativeTheme::kColorId_TextfieldReadOnlyColor:
- return SkColorSetA(kPrimaryTextColor, 0x61);
+ return SkColorSetA(base_theme->GetSystemColor(
+ NativeTheme::kColorId_TextfieldDefaultColor),
+ gfx::kDisabledControlAlpha);
default:
break;
« no previous file with comments | « ui/gfx/color_palette.h ('k') | ui/native_theme/native_theme_dark_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698