Use native theme colors for textfields; etc.

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 "base/command_line.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/events/event.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/range/range.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/selection_model.h"
+#include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/controls/textfield/native_textfield_wrapper.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 // TODO(beng): this should be removed when the OS_WIN hack from
 // ViewHierarchyChanged is removed.
@@ skipping 28 matching lines @@
     : native_wrapper_(NULL),
       controller_(NULL),
       style_(STYLE_DEFAULT),
       read_only_(false),
       default_width_in_chars_(0),
       draw_border_(true),
       text_color_(SK_ColorBLACK),
       use_default_text_color_(true),
       background_color_(SK_ColorWHITE),
       use_default_background_color_(true),
-      cursor_color_(SK_ColorBLACK),
-      use_default_cursor_color_(true),
       initialized_(false),
       horizontal_margins_were_set_(false),
       vertical_margins_were_set_(false),
       placeholder_text_color_(kDefaultPlaceholderTextColor),
       text_input_type_(ui::TEXT_INPUT_TYPE_TEXT) {
   set_focusable(true);
 }
 
 Textfield::Textfield(StyleFlags style)
     : native_wrapper_(NULL),
       controller_(NULL),
       style_(style),
       read_only_(false),
       default_width_in_chars_(0),
       draw_border_(true),
       text_color_(SK_ColorBLACK),
       use_default_text_color_(true),
       background_color_(SK_ColorWHITE),
       use_default_background_color_(true),
-      cursor_color_(SK_ColorBLACK),
-      use_default_cursor_color_(true),
       initialized_(false),
       horizontal_margins_were_set_(false),
       vertical_margins_were_set_(false),
       placeholder_text_color_(kDefaultPlaceholderTextColor),
       text_input_type_(ui::TEXT_INPUT_TYPE_TEXT) {
   set_focusable(true);
   if (IsObscured())
     SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
 }
 
 Textfield::~Textfield() {
 }
 
 void Textfield::SetController(TextfieldController* controller) {
   controller_ = controller;
 }
 
 TextfieldController* Textfield::GetController() const {
   return controller_;
 }
 
 void Textfield::SetReadOnly(bool read_only) {
   read_only_ = read_only;
   set_focusable(!read_only);
   if (native_wrapper_) {
     native_wrapper_->UpdateReadOnly();
     native_wrapper_->UpdateTextColor();
     native_wrapper_->UpdateBackgroundColor();
-    native_wrapper_->UpdateCursorColor();
   }
 }
 
 bool Textfield::IsObscured() const {
   return style_ & STYLE_OBSCURED;
 }
 
 void Textfield::SetObscured(bool obscured) {
   if (obscured) {
     style_ = static_cast<StyleFlags>(style_ | STYLE_OBSCURED);
@@ skipping 60 matching lines @@
     native_wrapper_->ClearSelection();
 }
 
 bool Textfield::HasSelection() const {
   ui::Range range;
   if (native_wrapper_)
     native_wrapper_->GetSelectedRange(&range);
   return !range.is_empty();
 }
 
+SkColor Textfield::GetTextColor() const {
+  if (!use_default_text_color_)
+    return text_color_;
+
+  return GetNativeTheme()->GetSystemColor(read_only() ?
+      ui::NativeTheme::kColorId_TextfieldReadOnlyColor :
+      ui::NativeTheme::kColorId_TextfieldDefaultColor);
+}
+
 void Textfield::SetTextColor(SkColor color) {
   text_color_ = color;
   use_default_text_color_ = false;
   if (native_wrapper_)
     native_wrapper_->UpdateTextColor();
 }
 
 void Textfield::UseDefaultTextColor() {
   use_default_text_color_ = true;
   if (native_wrapper_)
     native_wrapper_->UpdateTextColor();
 }
 
+SkColor Textfield::GetBackgroundColor() const {
+  if (!use_default_background_color_)
+    return background_color_;
+
+  return GetNativeTheme()->GetSystemColor(read_only() ?
+      ui::NativeTheme::kColorId_TextfieldReadOnlyBackground :
+      ui::NativeTheme::kColorId_TextfieldDefaultBackground);
+}
+
 void Textfield::SetBackgroundColor(SkColor color) {
   background_color_ = color;
   use_default_background_color_ = false;
   if (native_wrapper_)
     native_wrapper_->UpdateBackgroundColor();
 }
 
 void Textfield::UseDefaultBackgroundColor() {
   use_default_background_color_ = true;
   if (native_wrapper_)
     native_wrapper_->UpdateBackgroundColor();
 }
 
-void Textfield::SetCursorColor(SkColor color) {
-  cursor_color_ = color;
-  use_default_cursor_color_ = false;
-  if (native_wrapper_)
-    native_wrapper_->UpdateCursorColor();
+bool Textfield::GetCursorEnabled() const {
+  return native_wrapper_ && native_wrapper_->GetCursorEnabled();
 }
 
-void Textfield::UseDefaultCursorColor() {
-  use_default_cursor_color_ = true;
+void Textfield::SetCursorEnabled(bool enabled) {
   if (native_wrapper_)
-    native_wrapper_->UpdateCursorColor();
+    native_wrapper_->SetCursorEnabled(enabled);
 }
 
 void Textfield::SetFont(const gfx::Font& font) {
   font_ = font;
   if (native_wrapper_)
     native_wrapper_->UpdateFont();
   PreferredSizeChanged();
 }
 
 void Textfield::SetHorizontalMargins(int left, int right) {
@@ skipping 35 matching lines @@
   *top = margins_.top();
   *bottom = margins_.bottom();
   return true;
 }
 
 void Textfield::UpdateAllProperties() {
   if (native_wrapper_) {
     native_wrapper_->UpdateText();
     native_wrapper_->UpdateTextColor();
     native_wrapper_->UpdateBackgroundColor();
-    native_wrapper_->UpdateCursorColor();
     native_wrapper_->UpdateReadOnly();
     native_wrapper_->UpdateFont();
     native_wrapper_->UpdateEnabled();
     native_wrapper_->UpdateBorder();
     native_wrapper_->UpdateIsObscured();
     native_wrapper_->UpdateHorizontalMargins();
     native_wrapper_->UpdateVerticalMargins();
   }
 }
 
@@ skipping 216 matching lines @@
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
 #if defined(OS_WIN) && !defined(USE_AURA)
   if (!Textfield::IsViewsTextfieldEnabled())
     return new NativeTextfieldWin(field);
 #endif
   return new NativeTextfieldViews(field);
 }
 
 }  // namespace views