Use native theme colors for textfields; etc.

ui/views/controls/textfield/native_textfield_views.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_views.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 29 matching lines @@
 #include "ui/views/metrics.h"
 #include "ui/views/widget/widget.h"
 #include "unicode/uchar.h"
 
 #if defined(USE_AURA)
 #include "ui/base/cursor/cursor.h"
 #endif
 
 namespace {
 
-// Text color for read only.
-const SkColor kReadonlyTextColor = SK_ColorDKGRAY;
-
 // Default "system" color for text cursor.
 const SkColor kDefaultCursorColor = SK_ColorBLACK;
 
 // Parameters to control cursor blinking.
 const int kCursorVisibleTimeMs = 800;
 const int kCursorInvisibleTimeMs = 500;
 
 }  // namespace
 
 namespace views {
@@ skipping 14 matching lines @@
       ALLOW_THIS_IN_INITIALIZER_LIST(touch_selection_controller_(
           TouchSelectionController::create(this))) {
   set_border(text_border_);
 
 #if defined(OS_CHROMEOS)
   GetRenderText()->SetFontList(gfx::FontList(l10n_util::GetStringUTF8(
       IDS_UI_FONT_FAMILY_CROS)));
 #else
   GetRenderText()->SetFont(textfield_->font());
 #endif
-  // Set the default text style.
-  gfx::StyleRange default_style;
-  default_style.foreground = textfield_->text_color();
-  GetRenderText()->set_default_style(default_style);
-  GetRenderText()->ApplyDefaultStyle();
 
+  UpdateColorsFromTheme(GetNativeTheme());
   set_context_menu_controller(this);
   set_drag_controller(this);
 }
 
 NativeTextfieldViews::~NativeTextfieldViews() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldViews, View overrides:
 
@@ skipping 166 matching lines @@
 
 void NativeTextfieldViews::OnFocus() {
   NOTREACHED();
 }
 
 void NativeTextfieldViews::OnBlur() {
   NOTREACHED();
 }
 
 void NativeTextfieldViews::OnNativeThemeChanged(const ui::NativeTheme* theme) {
-  gfx::RenderText* render_text = GetRenderText();
-  render_text->set_selection_color(
-      theme->GetSystemColor(ui::NativeTheme::kColorId_TextfieldSelectionColor));
-  render_text->set_selection_background_focused_color(
-      theme->GetSystemColor(
-          ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused));
-  render_text->set_selection_background_unfocused_color(
-      theme->GetSystemColor(
-              ui::NativeTheme::kColorId_TextfieldSelectionBackgroundUnfocused));
+  UpdateColorsFromTheme(theme);
 }
 
 void NativeTextfieldViews::SelectRect(const gfx::Point& start,
                                       const gfx::Point& end) {
   if (GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE)
     return;
 
   gfx::SelectionModel start_caret = GetRenderText()->FindCursorPosition(start);
   gfx::SelectionModel end_caret = GetRenderText()->FindCursorPosition(end);
   gfx::SelectionModel selection(
@@ skipping 121 matching lines @@
     gfx::Insets insets = GetInsets();
     textfield_->SetHorizontalMargins(insets.left(), insets.right());
     textfield_->SetVerticalMargins(insets.top(), insets.bottom());
   } else {
     textfield_->SetHorizontalMargins(0, 0);
     textfield_->SetVerticalMargins(0, 0);
   }
 }
 
 void NativeTextfieldViews::UpdateTextColor() {
+  gfx::StyleRange default_style(GetRenderText()->default_style());
+  default_style.foreground = textfield_->GetTextColor();
+  GetRenderText()->set_default_style(default_style);
+  GetRenderText()->ApplyDefaultStyle();
   SchedulePaint();
 }
 
 void NativeTextfieldViews::UpdateBackgroundColor() {
-  // TODO(oshima): Background has to match the border's shape.
-  set_background(
-      Background::CreateSolidBackground(textfield_->background_color()));
-  SchedulePaint();
-}
-
-void NativeTextfieldViews::UpdateCursorColor() {
+  const SkColor color = textfield_->GetBackgroundColor();
+  set_background(Background::CreateSolidBackground(color));
+  GetRenderText()->set_background_is_transparent(SkColorGetA(color) != 0xFF);
   SchedulePaint();
 }
 
 void NativeTextfieldViews::UpdateReadOnly() {
-  // Update the default text style.
-  gfx::StyleRange default_style(GetRenderText()->default_style());
-  default_style.foreground = textfield_->read_only() ? kReadonlyTextColor :
-                                                       textfield_->text_color();
-  GetRenderText()->set_default_style(default_style);
-  GetRenderText()->ApplyDefaultStyle();
-
-  SchedulePaint();
   OnTextInputTypeChanged();
 }
 
 void NativeTextfieldViews::UpdateFont() {
 #if defined(OS_CHROMEOS)
   // For ChromeOS, we support a pre-defined font list per locale. UpdateFont()
   // only changes the font size, not the font family names.
   GetRenderText()->SetFontSize(textfield_->font().GetFontSize());
 #else
   GetRenderText()->SetFont(textfield_->font());
@@ skipping 447 matching lines @@
 
 gfx::RenderText* NativeTextfieldViews::GetRenderText() const {
   return model_->render_text();
 }
 
 string16 NativeTextfieldViews::GetTextForDisplay(const string16& text) {
   return textfield_->style() & Textfield::STYLE_LOWERCASE ?
       base::i18n::ToLower(text) : text;
 }
 
+void NativeTextfieldViews::UpdateColorsFromTheme(const ui::NativeTheme* theme) {
+  UpdateTextColor();
+  UpdateBackgroundColor();
+  gfx::RenderText* render_text = GetRenderText();
+  render_text->set_cursor_color(kDefaultCursorColor);
+  render_text->set_selection_color(theme->GetSystemColor(
+      ui::NativeTheme::kColorId_TextfieldSelectionColor));
+  render_text->set_selection_background_focused_color(theme->GetSystemColor(
+      ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused));
+  render_text->set_selection_background_unfocused_color(theme->GetSystemColor(
+      ui::NativeTheme::kColorId_TextfieldSelectionBackgroundUnfocused));
+}
+
 void NativeTextfieldViews::UpdateCursor() {
   is_cursor_visible_ = !is_cursor_visible_;
   RepaintCursor();
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&NativeTextfieldViews::UpdateCursor,
                  cursor_timer_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(
           is_cursor_visible_ ? kCursorVisibleTimeMs : kCursorInvisibleTimeMs));
 }
 
 void NativeTextfieldViews::RepaintCursor() {
   gfx::Rect r(GetCaretBounds());
   r.Inset(-1, -1, -1, -1);
   SchedulePaintInRect(r);
 }
 
 void NativeTextfieldViews::PaintTextAndCursor(gfx::Canvas* canvas) {
   TRACE_EVENT0("views", "NativeTextfieldViews::PaintTextAndCursor");
   canvas->Save();
-  GetRenderText()->set_background_is_transparent(
-      !textfield_->use_default_background_color() &&
-      SkColorGetA(textfield_->background_color()) != 0xFF);
   GetRenderText()->set_cursor_visible(is_drop_cursor_visible_ ||
       (is_cursor_visible_ && !model_->HasSelection()));
-  GetRenderText()->set_cursor_color(
-      textfield_->use_default_cursor_color() ?
-          kDefaultCursorColor :
-          textfield_->cursor_color());
   // Draw the text, cursor, and selection.
   GetRenderText()->Draw(canvas);
 
   // Draw placeholder text if needed.
   if (model_->GetText().empty() &&
       !textfield_->placeholder_text().empty()) {
     canvas->DrawStringInt(
         textfield_->placeholder_text(),
         GetRenderText()->GetFont(),
         textfield_->placeholder_text_color(),
@@ skipping 307 matching lines @@
   // Filter out all control characters, including tab and new line characters,
   // and all characters with Alt modifier. But we need to allow characters with
   // AltGr modifier.
   // On Windows AltGr is represented by Alt+Ctrl, and on Linux it's a different
   // flag that we don't care about.
   return ((ch >= 0x20 && ch < 0x7F) || ch > 0x9F) &&
       (flags & ~(ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_DOWN)) != ui::EF_ALT_DOWN;
 }
 
 }  // namespace views