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

Unified Diff: ui/views/controls/tabbed_pane/native_tabbed_pane_win.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/scrollbar/native_scroll_bar_views.cc ('k') | ui/views/controls/table/table_view_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc
diff --git a/ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index f6924ef318ae0d30ad2688f59c805fbf93759d60..ae762f358a7935f14a916577ce80fe029e2545bb 100644
--- a/ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc
@@ -13,7 +13,7 @@
#include "ui/base/win/hwnd_util.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/font.h"
-#include "ui/gfx/native_theme_win.h"
+#include "ui/base/native_theme/native_theme_win.h"
#include "ui/views/controls/tabbed_pane/tabbed_pane.h"
#include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h"
#include "ui/views/layout/fill_layout.h"
@@ -30,8 +30,8 @@ class TabBackground : public Background {
// TMT_FILLCOLORHINT returns a color value that supposedly
// approximates the texture drawn by PaintTabPanelBackground.
SkColor tab_page_color =
- gfx::NativeThemeWin::instance()->GetThemeColorWithDefault(
- gfx::NativeThemeWin::TAB, TABP_BODY, 0, TMT_FILLCOLORHINT,
+ ui::NativeThemeWin::instance()->GetThemeColorWithDefault(
+ ui::NativeThemeWin::TAB, TABP_BODY, 0, TMT_FILLCOLORHINT,
COLOR_3DFACE);
SetNativeControlColor(tab_page_color);
}
@@ -39,10 +39,10 @@ class TabBackground : public Background {
virtual void Paint(gfx::Canvas* canvas, View* view) const {
gfx::Rect r(0, 0, view->width(), view->height());
- gfx::NativeTheme::ExtraParams extra;
- gfx::NativeTheme::instance()->Paint(
- canvas->sk_canvas(), gfx::NativeTheme::kTabPanelBackground,
- gfx::NativeTheme::kNormal, r, extra);
+ ui::NativeTheme::ExtraParams extra;
+ ui::NativeTheme::instance()->Paint(
+ canvas->sk_canvas(), ui::NativeTheme::kTabPanelBackground,
+ ui::NativeTheme::kNormal, r, extra);
}
private:
« no previous file with comments | « ui/views/controls/scrollbar/native_scroll_bar_views.cc ('k') | ui/views/controls/table/table_view_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698