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

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

Issue 10387121: Revert 136996 - ui: Move NativeTheme files into ui/base/native_theme/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/table/table_view_views.cc ('k') | ui/views/controls/textfield/textfield_views_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/textfield/native_textfield_win.cc
===================================================================
--- ui/views/controls/textfield/native_textfield_win.cc (revision 137002)
+++ ui/views/controls/textfield/native_textfield_win.cc (working copy)
@@ -20,9 +20,9 @@
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/l10n/l10n_util_win.h"
-#include "ui/base/native_theme/native_theme_win.h"
#include "ui/base/range/range.h"
#include "ui/base/win/mouse_wheel_util.h"
+#include "ui/gfx/native_theme_win.h"
#include "ui/views/controls/label.h"
#include "ui/views/controls/menu/menu_item_view.h"
#include "ui/views/controls/menu/menu_model_adapter.h"
@@ -920,9 +920,9 @@
int classic_state =
(!textfield_->enabled() || textfield_->read_only()) ? DFCS_INACTIVE : 0;
- ui::NativeThemeWin::instance()->PaintTextField(hdc, part, state,
- classic_state, &window_rect,
- bg_color_, false, true);
+ gfx::NativeThemeWin::instance()->PaintTextField(hdc, part, state,
+ classic_state, &window_rect,
+ bg_color_, false, true);
// NOTE: I tried checking the transparent property of the theme and invoking
// drawParentBackground, but it didn't seem to make a difference.
« no previous file with comments | « ui/views/controls/table/table_view_views.cc ('k') | ui/views/controls/textfield/textfield_views_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698