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

Unified Diff: ui/views/style/typography_provider.cc

Issue 2964453002: Use style::CONTEXT_TEXTFIELD for Combobox and Textfield (Closed)
Patch Set: Try mac again Created 3 years, 6 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
Index: ui/views/style/typography_provider.cc
diff --git a/ui/views/style/typography_provider.cc b/ui/views/style/typography_provider.cc
index 11bce4e92bc6465d84020f90d904fa30116c4e60..10a2ea56209256c920dd2183c5e5a3e18f85a120 100644
--- a/ui/views/style/typography_provider.cc
+++ b/ui/views/style/typography_provider.cc
@@ -52,6 +52,13 @@ SkColor DefaultTypographyProvider::GetColor(
int context,
int style,
const ui::NativeTheme& theme) const {
+ if (context == style::CONTEXT_TEXTFIELD) {
+ return theme.GetSystemColor(
+ style == style::STYLE_DISABLED
+ ? ui::NativeTheme::kColorId_TextfieldReadOnlyColor
+ : ui::NativeTheme::kColorId_TextfieldDefaultColor);
+ }
+
return theme.GetSystemColor(
(style == style::STYLE_DISABLED)
? ui::NativeTheme::kColorId_LabelDisabledColor
« ui/views/controls/textfield/textfield.cc ('K') | « ui/views/controls/textfield/textfield.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698