Use style::CONTEXT_TEXTFIELD for Combobox and Textfield

ui/views/controls/textfield/textfield.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/textfield/textfield.h"
 
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 367 matching lines @@
 }
 
 bool Textfield::HasSelection() const {
   return !GetSelectedRange().is_empty();
 }
 
 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) {
   text_color_ = color;
   use_default_text_color_ = false;
   SetColor(color);
 }
 
 void Textfield::UseDefaultTextColor() {
   use_default_text_color_ = true;
@@ skipping 1719 matching lines @@
   cursor_blink_timer_.Stop();
 }
 
 void Textfield::OnCursorBlinkTimerFired() {
   DCHECK(ShouldBlinkCursor());
   cursor_view_.SetVisible(!cursor_view_.visible());
   UpdateCursorViewPosition();
 }
 
 }  // namespace views