Use style::CONTEXT_TEXTFIELD for Combobox and Textfield

ui/views/controls/textfield/textfield.cc

Index: ui/views/controls/textfield/textfield.cc
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index 7e9dbae11d8d961b29cab6b5deea857572a2bc70..162569bb7033a5deff8105ea8f4c79e2071fd16e 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -385,9 +385,9 @@ SkColor Textfield::GetTextColor() const {
   if (!use_default_text_color_)
     return text_color_;
 
-  return GetNativeTheme()->GetSystemColor(read_only() || !enabled() ?
-      ui::NativeTheme::kColorId_TextfieldReadOnlyColor :
-      ui::NativeTheme::kColorId_TextfieldDefaultColor);
+  int style =
+      read_only() || !enabled() ? style::STYLE_DISABLED : style::STYLE_PRIMARY;

[Peter Kasting, 2017/06/29 20:24:57]

Nit: Please put parens around the condition before the ?: here, precedence on
things like ? isn't something I know offhand.

[tapted, 2017/06/30 05:53:43]

Done.

+  return style::GetColor(style::CONTEXT_TEXTFIELD, style, GetNativeTheme());
 }
 
 void Textfield::SetTextColor(SkColor color) {