Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Unified Diff: ui/views/controls/textfield/textfield_views_model.cc

Issue 10310136: ui: Move NativeTheme files into ui/base/native_theme/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/textfield/native_textfield_win.cc ('k') | ui/views/controls/tree/tree_view_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/textfield/textfield_views_model.cc
diff --git a/ui/views/controls/textfield/textfield_views_model.cc b/ui/views/controls/textfield/textfield_views_model.cc
index a931a16468d92b49fee327ed527cc3a4392bc64b..6d8dd76a4f91906b199b8858f9c2c22167c5cdcc 100644
--- a/ui/views/controls/textfield/textfield_views_model.cc
+++ b/ui/views/controls/textfield/textfield_views_model.cc
@@ -16,7 +16,7 @@
#include "ui/base/text/utf16_indexing.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/font.h"
-#include "ui/gfx/native_theme.h"
+#include "ui/base/native_theme/native_theme.h"
#include "ui/gfx/render_text.h"
#include "ui/views/controls/textfield/textfield.h"
#include "ui/views/views_delegate.h"
@@ -284,16 +284,16 @@ TextfieldViewsModel::TextfieldViewsModel(Delegate* delegate)
: delegate_(delegate),
render_text_(gfx::RenderText::CreateRenderText()),
current_edit_(edit_history_.end()) {
- const gfx::NativeTheme* theme = gfx::NativeTheme::instance();
+ const ui::NativeTheme* theme = ui::NativeTheme::instance();
render_text_->set_selection_color(
theme->GetSystemColor(
- gfx::NativeTheme::kColorId_TextfieldSelectionColor));
+ ui::NativeTheme::kColorId_TextfieldSelectionColor));
render_text_->set_selection_background_focused_color(
theme->GetSystemColor(
- gfx::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused));
+ ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused));
render_text_->set_selection_background_unfocused_color(
theme->GetSystemColor(
- gfx::NativeTheme::kColorId_TextfieldSelectionBackgroundUnfocused));
+ ui::NativeTheme::kColorId_TextfieldSelectionBackgroundUnfocused));
}
TextfieldViewsModel::~TextfieldViewsModel() {
« no previous file with comments | « ui/views/controls/textfield/native_textfield_win.cc ('k') | ui/views/controls/tree/tree_view_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698