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

Unified Diff: ui/native_theme/common_theme.cc

Issue 2319193002: More Harmony combobox/textfield updates: (Closed)
Patch Set: textfields 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 | « no previous file | ui/views/controls/combobox/combobox.h » ('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 78c5b5bffe3ca5a90f53b3f5e931983a6ecf2e21..82424be45160422c520e79600699d0a04f402380 100644
--- a/ui/native_theme/common_theme.cc
+++ b/ui/native_theme/common_theme.cc
@@ -25,10 +25,27 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
static const SkColor kPrimaryTextColor = SkColorSetRGB(0x33, 0x33, 0x33);
- if (color_id == NativeTheme::kColorId_LabelEnabledColor)
- return kPrimaryTextColor;
- if (color_id == NativeTheme::kColorId_UnfocusedBorderColor)
- return SkColorSetA(SK_ColorBLACK, 0x24);
+ switch (color_id) {
+ // Labels
+ case NativeTheme::kColorId_LabelEnabledColor:
+ return kPrimaryTextColor;
+
+ // FocusableBorder
+ case NativeTheme::kColorId_UnfocusedBorderColor:
+ return SkColorSetA(SK_ColorBLACK, 0x24);
+
+ // Textfields
+ case NativeTheme::kColorId_TextfieldDefaultColor:
+ return kPrimaryTextColor;
+ case NativeTheme::kColorId_TextfieldDefaultBackground:
+ return base_theme->GetSystemColor(
+ NativeTheme::kColorId_DialogBackground);
+ case NativeTheme::kColorId_TextfieldReadOnlyColor:
+ return SkColorSetA(kPrimaryTextColor, 0x61);
+
+ default:
+ break;
+ }
}
// MD colors.
« no previous file with comments | « no previous file | ui/views/controls/combobox/combobox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698