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

Unified Diff: ui/views/controls/menu/menu_separator_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/menu/menu_separator_views.cc ('k') | ui/views/controls/menu/native_menu_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_separator_win.cc
diff --git a/ui/views/controls/menu/menu_separator_win.cc b/ui/views/controls/menu/menu_separator_win.cc
index a576914077f33d8277846c7411419f7ac9e0f002..6979a506bc88b2d6dc338884ddb21a8649e00a33 100644
--- a/ui/views/controls/menu/menu_separator_win.cc
+++ b/ui/views/controls/menu/menu_separator_win.cc
@@ -9,7 +9,7 @@
#include <Vssym32.h>
#include "ui/gfx/canvas.h"
-#include "ui/gfx/native_theme.h"
+#include "ui/base/native_theme/native_theme.h"
#include "ui/gfx/rect.h"
#include "ui/views/controls/menu/menu_config.h"
#include "ui/views/controls/menu/menu_item_view.h"
@@ -20,24 +20,24 @@ void MenuSeparator::OnPaint(gfx::Canvas* canvas) {
const MenuConfig& config = MenuConfig::instance();
// The gutter is rendered before the background.
int start_x = 0;
- const gfx::NativeTheme* theme = gfx::NativeTheme::instance();
+ const ui::NativeTheme* theme = ui::NativeTheme::instance();
if (config.render_gutter) {
// If render_gutter is true, we're on Vista and need to render the
// gutter, then indent the separator from the gutter.
gfx::Rect gutter_bounds(MenuItemView::label_start() -
config.gutter_to_label - config.gutter_width, 0,
config.gutter_width, height());
- gfx::NativeTheme::ExtraParams extra;
- theme->Paint(canvas->sk_canvas(), gfx::NativeTheme::kMenuPopupGutter,
- gfx::NativeTheme::kNormal, gutter_bounds, extra);
+ ui::NativeTheme::ExtraParams extra;
+ theme->Paint(canvas->sk_canvas(), ui::NativeTheme::kMenuPopupGutter,
+ ui::NativeTheme::kNormal, gutter_bounds, extra);
start_x = gutter_bounds.x() + config.gutter_width;
}
gfx::Rect separator_bounds(start_x, 0, width(), height());
- gfx::NativeTheme::ExtraParams extra;
+ ui::NativeTheme::ExtraParams extra;
extra.menu_separator.has_gutter = config.render_gutter;
- theme->Paint(canvas->sk_canvas(), gfx::NativeTheme::kMenuPopupSeparator,
- gfx::NativeTheme::kNormal, separator_bounds, extra);
+ theme->Paint(canvas->sk_canvas(), ui::NativeTheme::kMenuPopupSeparator,
+ ui::NativeTheme::kNormal, separator_bounds, extra);
}
gfx::Size MenuSeparator::GetPreferredSize() {
« no previous file with comments | « ui/views/controls/menu/menu_separator_views.cc ('k') | ui/views/controls/menu/native_menu_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698