Use native theme colors for textfields; etc.

chrome/browser/ui/views/omnibox/omnibox_view_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 "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 176 matching lines @@
     bool result = views::Textfield::OnMouseDragged(event);
     omnibox_view_->HandleMouseDragEvent(event);
     return result;
   }
 
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE {
     views::Textfield::OnMouseReleased(event);
     omnibox_view_->HandleMouseReleaseEvent(event);
   }
 
- protected:
-  // views::View implementation.
-  virtual void PaintChildren(gfx::Canvas* canvas) {
-    views::Textfield::PaintChildren(canvas);
-  }
-
  private:
   OmniboxViewViews* omnibox_view_;
   LocationBarView* location_bar_view_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteTextfield);
 };
 
 // static
 const char OmniboxViewViews::kViewClassName[] = "BrowserOmniboxViewViews";
 
 OmniboxViewViews::OmniboxViewViews(OmniboxEditController* controller,
                                    ToolbarModel* toolbar_model,
                                    Profile* profile,
                                    CommandUpdater* command_updater,
                                    bool popup_window_mode,
                                    LocationBarView* location_bar)
     : OmniboxView(profile, controller, toolbar_model, command_updater),
       textfield_(NULL),
       popup_window_mode_(popup_window_mode),
       security_level_(ToolbarModel::NONE),
       ime_composing_before_change_(false),
       delete_at_end_pressed_(false),
       location_bar_view_(location_bar),
       ime_candidate_window_open_(false),
-      select_all_on_mouse_release_(false),
-      visible_caret_color_(SK_ColorBLACK) {
+      select_all_on_mouse_release_(false) {
 }
 
 OmniboxViewViews::~OmniboxViewViews() {
 #if defined(OS_CHROMEOS)
   chromeos::input_method::InputMethodManager::GetInstance()->
       RemoveCandidateWindowObserver(this);
 #endif
 
   // Explicitly teardown members which have a reference to us.  Just to be safe
   // we want them to be destroyed before destroying any other internal state.
@@ skipping 344 matching lines @@
   // because if we already have invisible focus, the RequestFocus() call below
   // will short-circuit, preventing us from reaching
   // OmniboxEditModel::OnSetFocus(), which handles restoring visibility when we
   // didn't previously have focus.
   model()->SetCaretVisibility(true);
   // In views-implementation, the focus is on textfield rather than OmniboxView.
   textfield_->RequestFocus();
 }
 
 void OmniboxViewViews::ApplyCaretVisibility() {
-  if (textfield_->cursor_color() != textfield_->background_color())
-    visible_caret_color_ = textfield_->cursor_color();
-  // Setting the color of the text cursor (caret) to the background color
-  // effectively hides it.
-  textfield_->SetCursorColor(model()->is_caret_visible() ?
-      visible_caret_color_ : textfield_->background_color());
+  textfield_->SetCursorEnabled(model()->is_caret_visible());
 }
 
 void OmniboxViewViews::OnTemporaryTextMaybeChanged(
     const string16& display_text,
     bool save_original_selection) {
   if (save_original_selection)
     textfield_->GetSelectedRange(&saved_temporary_selection_);
 
   SetWindowTextAndCaretPos(display_text, display_text.length(), false, true);
 }
@@ skipping 366 matching lines @@
   if (!text.empty()) {
     // Record this paste, so we can do different behavior.
     model()->on_paste();
     // Force a Paste operation to trigger the text_changed code in
     // OnAfterPossibleChange(), even if identical contents are pasted into the
     // text box.
     text_before_change_.clear();
     textfield_->ReplaceSelection(text);
   }
 }