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

Unified Diff: ui/views/controls/menu/menu_item_view_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
Index: ui/views/controls/menu/menu_item_view_win.cc
diff --git a/ui/views/controls/menu/menu_item_view_win.cc b/ui/views/controls/menu/menu_item_view_win.cc
index 8458e22e3be833a991a71eee05477f95ba8f22ea..ba6f9d72cf2576c1cdab330060e91eb693df76a2 100644
--- a/ui/views/controls/menu/menu_item_view_win.cc
+++ b/ui/views/controls/menu/menu_item_view_win.cc
@@ -9,11 +9,11 @@
#include "grit/ui_strings.h"
#include "ui/gfx/canvas.h"
-#include "ui/gfx/native_theme_win.h"
+#include "ui/base/native_theme/native_theme_win.h"
#include "ui/views/controls/menu/menu_config.h"
#include "ui/views/controls/menu/submenu_view.h"
-using gfx::NativeTheme;
+using ui::NativeTheme;
namespace views {
@@ -79,8 +79,8 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
// Render the foreground.
// Menu color is specific to Vista, fallback to classic colors if can't
// get color.
- SkColor fg_color = gfx::NativeThemeWin::instance()->GetThemeColorWithDefault(
- gfx::NativeThemeWin::MENU, MENU_POPUPITEM, state, TMT_TEXTCOLOR,
+ SkColor fg_color = ui::NativeThemeWin::instance()->GetThemeColorWithDefault(
+ ui::NativeThemeWin::MENU, MENU_POPUPITEM, state, TMT_TEXTCOLOR,
default_sys_color);
const gfx::Font& font = GetFont();
int accel_width = parent_menu_item_->GetSubmenu()->max_accelerator_width();
@@ -124,11 +124,11 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
// If our sub menus open from right to left (which is the case when the
// locale is RTL) then we should make sure the menu arrow points to the
// right direction.
- gfx::NativeTheme::ExtraParams extra;
+ ui::NativeTheme::ExtraParams extra;
extra.menu_arrow.pointing_right = !base::i18n::IsRTL();
extra.menu_arrow.is_selected = render_selection;
- gfx::NativeTheme::instance()->Paint(canvas->sk_canvas(),
- gfx::NativeTheme::kMenuPopupArrow, control_state, arrow_bounds, extra);
+ ui::NativeTheme::instance()->Paint(canvas->sk_canvas(),
+ ui::NativeTheme::kMenuPopupArrow, control_state, arrow_bounds, extra);
}
}
« no previous file with comments | « ui/views/controls/menu/menu_item_view_views.cc ('k') | ui/views/controls/menu/menu_scroll_view_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698