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

Unified Diff: ui/views/controls/menu/menu_separator_win.cc

Issue 191723003: Nukes USE_AURA ifdefs from views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: incorporate feedback Created 6 years, 9 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.h ('k') | ui/views/controls/native/native_view_host.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 6f95334790adfb02f71ba9d9cf207ddc552395cd..87d0a2bb2e779317af1fb97e6048e09aaf16d090 100644
--- a/ui/views/controls/menu/menu_separator_win.cc
+++ b/ui/views/controls/menu/menu_separator_win.cc
@@ -11,24 +11,19 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/rect.h"
#include "ui/native_theme/native_theme.h"
+#include "ui/native_theme/native_theme_aura.h"
#include "ui/views/controls/menu/menu_config.h"
#include "ui/views/controls/menu/menu_item_view.h"
-#if defined(USE_AURA)
-#include "ui/native_theme/native_theme_aura.h"
-#endif
-
namespace views {
void MenuSeparator::OnPaint(gfx::Canvas* canvas) {
const MenuConfig& config = parent_menu_item_->GetMenuConfig();
-#if defined(USE_AURA)
if (config.native_theme == ui::NativeThemeAura::instance()) {
OnPaintAura(canvas);
return;
}
-#endif
int start_x = 0;
if (config.render_gutter) {
@@ -55,10 +50,8 @@ void MenuSeparator::OnPaint(gfx::Canvas* canvas) {
gfx::Size MenuSeparator::GetPreferredSize() {
const MenuConfig& config = parent_menu_item_->GetMenuConfig();
-#if defined(USE_AURA)
if (config.native_theme == ui::NativeThemeAura::instance())
return GetPreferredSizeAura();
-#endif
return gfx::Size(10, // Just in case we're the only item in a menu.
config.separator_height);
« no previous file with comments | « ui/views/controls/menu/menu_separator.h ('k') | ui/views/controls/native/native_view_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698