Use native theme colors for textfields; etc.

ui/views/controls/textfield/native_textfield_win.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/native_textfield_win.h"
 
 #include <algorithm>
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
@@ skipping 231 matching lines @@
 
 void NativeTextfieldWin::UpdateBorder() {
   SetWindowPos(NULL, 0, 0, 0, 0,
                SWP_NOMOVE | SWP_FRAMECHANGED | SWP_NOACTIVATE |
                SWP_NOOWNERZORDER | SWP_NOSIZE);
 }
 
 void NativeTextfieldWin::UpdateTextColor() {
   CHARFORMAT cf = {0};
   cf.dwMask = CFM_COLOR;
-  cf.crTextColor = textfield_->use_default_text_color() ?
-      GetSysColor(textfield_->read_only() ? COLOR_GRAYTEXT : COLOR_WINDOWTEXT) :
-      skia::SkColorToCOLORREF(textfield_->text_color());
+  cf.crTextColor = skia::SkColorToCOLORREF(textfield_->GetTextColor());
   CRichEditCtrl::SetDefaultCharFormat(cf);
 }
 
 void NativeTextfieldWin::UpdateBackgroundColor() {
-  if (!textfield_->use_default_background_color()) {
-    bg_color_ = skia::SkColorToCOLORREF(textfield_->background_color());
-  } else {
-    bg_color_ = GetSysColor(textfield_->read_only() ? COLOR_3DFACE
-                                                    : COLOR_WINDOW);
-  }
-  CRichEditCtrl::SetBackgroundColor(bg_color_);
-}
-
-void NativeTextfieldWin::UpdateCursorColor() {
-  if (!textfield_->use_default_cursor_color())
-    NOTIMPLEMENTED();
+  CRichEditCtrl::SetBackgroundColor(
+      skia::SkColorToCOLORREF(textfield_->GetBackgroundColor()));
 }
 
 void NativeTextfieldWin::UpdateReadOnly() {
   SendMessage(m_hWnd, EM_SETREADONLY, textfield_->read_only(), 0);
   UpdateAccessibleState(STATE_SYSTEM_READONLY, textfield_->read_only());
 }
 
 void NativeTextfieldWin::UpdateFont() {
   SendMessage(m_hWnd, WM_SETFONT,
               reinterpret_cast<WPARAM>(textfield_->font().GetNativeFont()),
@@ skipping 991 matching lines @@
   context_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
   context_menu_contents_->AddItemWithStringId(IDS_APP_CUT, IDS_APP_CUT);
   context_menu_contents_->AddItemWithStringId(IDS_APP_COPY, IDS_APP_COPY);
   context_menu_contents_->AddItemWithStringId(IDS_APP_PASTE, IDS_APP_PASTE);
   context_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
   context_menu_contents_->AddItemWithStringId(IDS_APP_SELECT_ALL,
                                               IDS_APP_SELECT_ALL);
 }
 
 }  // namespace views