Use native theme colors for textfields; etc.

ui/views/controls/textfield/textfield_views_model.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_views_model.h"
 
 #include <algorithm>
 
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/range/range.h"
 #include "ui/base/text/utf16_indexing.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/render_text.h"
 #include "ui/gfx/text_constants.h"
-#include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/textfield/textfield.h"
 
 namespace views {
 
 namespace internal {
 
 // An edit object holds enough information/state to undo/redo the
 // change. Two edits are merged when possible, for example, when
 // you type new characters in sequence.  |Commit()| can be used to
 // mark an edit as an independent edit and it shouldn't be merged.
@@ skipping 245 matching lines @@
 /////////////////////////////////////////////////////////////////
 // TextfieldViewsModel: public
 
 TextfieldViewsModel::Delegate::~Delegate() {
 }
 
 TextfieldViewsModel::TextfieldViewsModel(Delegate* delegate)
     : delegate_(delegate),
       render_text_(gfx::RenderText::CreateInstance()),
       current_edit_(edit_history_.end()) {
-  const ui::NativeTheme* theme = ui::NativeTheme::instance();
-  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));
 }
 
 TextfieldViewsModel::~TextfieldViewsModel() {
   ClearEditHistory();
   ClearComposition();
 }
 
 const string16& TextfieldViewsModel::GetText() const {
   return render_text_->text();
 }
@@ skipping 473 matching lines @@
   if (delete_from != delete_to)
     render_text_->SetText(text.erase(delete_from, delete_to - delete_from));
   if (!new_text.empty())
     render_text_->SetText(text.insert(new_text_insert_at, new_text));
   render_text_->SetCursorPosition(new_cursor_pos);
   // TODO(oshima): mac selects the text that is just undone (but gtk doesn't).
   // This looks fine feature and we may want to do the same.
 }
 
 }  // namespace views