| 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);
|
| }
|
| }
|
|
|
|
|