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

Unified Diff: ui/views/controls/menu/menu_item_view_views.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/menu/menu_item_view.cc ('k') | ui/views/controls/menu/menu_item_view_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_item_view_views.cc
diff --git a/ui/views/controls/menu/menu_item_view_views.cc b/ui/views/controls/menu/menu_item_view_views.cc
index 6942dc965d0426280724f8e408b3a04cb3b25201..00beeb981579c92011baff315b4824b24a71d970 100644
--- a/ui/views/controls/menu/menu_item_view_views.cc
+++ b/ui/views/controls/menu/menu_item_view_views.cc
@@ -11,7 +11,7 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/favicon_size.h"
#include "ui/gfx/image/image.h"
-#include "ui/gfx/native_theme.h"
+#include "ui/base/native_theme/native_theme.h"
#include "ui/views/controls/menu/menu_config.h"
#include "ui/views/controls/menu/menu_image_util.h"
#include "ui/views/controls/menu/submenu_view.h"
@@ -37,8 +37,8 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
// only need the background when we want it to look different, as when we're
// selected.
if (render_selection) {
- SkColor bg_color = gfx::NativeTheme::instance()->GetSystemColor(
- gfx::NativeTheme::kColorId_FocusedMenuItemBackgroundColor);
+ SkColor bg_color = ui::NativeTheme::instance()->GetSystemColor(
+ ui::NativeTheme::kColorId_FocusedMenuItemBackgroundColor);
canvas->DrawColor(bg_color, SkXfermode::kSrc_Mode);
}
@@ -64,9 +64,9 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
}
// Render the foreground.
- SkColor fg_color = gfx::NativeTheme::instance()->GetSystemColor(
- enabled() ? gfx::NativeTheme::kColorId_EnabledMenuItemForegroundColor
- : gfx::NativeTheme::kColorId_DisabledMenuItemForegroundColor);
+ SkColor fg_color = ui::NativeTheme::instance()->GetSystemColor(
+ enabled() ? ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor
+ : ui::NativeTheme::kColorId_DisabledMenuItemForegroundColor);
const gfx::Font& font = GetFont();
int accel_width = parent_menu_item_->GetSubmenu()->max_accelerator_width();
« no previous file with comments | « ui/views/controls/menu/menu_item_view.cc ('k') | ui/views/controls/menu/menu_item_view_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698