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

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

Issue 191723003: Nukes USE_AURA ifdefs from views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup 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
Index: ui/views/controls/menu/menu_host_root_view.cc
diff --git a/ui/views/controls/menu/menu_host_root_view.cc b/ui/views/controls/menu/menu_host_root_view.cc
index 2577d909b7bc68457dca639068148948a3f13825..3bce4a49b6e730c7bf2a08815af388948ca52107 100644
--- a/ui/views/controls/menu/menu_host_root_view.cc
+++ b/ui/views/controls/menu/menu_host_root_view.cc
@@ -51,17 +51,8 @@ void MenuHostRootView::OnMouseMoved(const ui::MouseEvent& event) {
}
bool MenuHostRootView::OnMouseWheel(const ui::MouseWheelEvent& event) {
-#if defined(USE_AURA)
- // Aura uses MenuController to forward events like other mouse events.
return GetMenuController() &&
GetMenuController()->OnMouseWheel(submenu_, event);
-#else
- // Windows uses focus_util_win::RerouteMouseWheel to forward events to
- // the right menu.
- // RootView::OnMouseWheel forwards to the focused view. We don't have a
- // focused view, so we need to override this then forward to the menu.
- return submenu_->OnMouseWheel(event);
-#endif
}
void MenuHostRootView::DispatchGestureEvent(ui::GestureEvent* event) {

Powered by Google App Engine
This is Rietveld 408576698