Index: ui/views/controls/menu/menu_controller.cc |
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc |
index cb336e80e4acbdf567477b7d34c2a37b8f74f48a..d73e78cd61f2e5740ab34617670b657e633a1105 100644 |
--- a/ui/views/controls/menu/menu_controller.cc |
+++ b/ui/views/controls/menu/menu_controller.cc |
@@ -596,13 +596,11 @@ void MenuController::OnMouseEntered(SubmenuView* source, |
// do anything here. |
} |
-#if defined(USE_AURA) |
bool MenuController::OnMouseWheel(SubmenuView* source, |
const ui::MouseWheelEvent& event) { |
MenuPart part = GetMenuPart(source, event.location()); |
return part.submenu && part.submenu->OnMouseWheel(event); |
} |
-#endif |
void MenuController::OnGestureEvent(SubmenuView* source, |
ui::GestureEvent* event) { |
@@ -1061,7 +1059,7 @@ bool MenuController::Dispatch(const MSG& msg) { |
DispatchMessage(&msg); |
return exit_type_ == EXIT_NONE; |
} |
-#elif defined(USE_AURA) |
+#else |
bool MenuController::Dispatch(const base::NativeEvent& event) { |
if (exit_type_ == EXIT_ALL || exit_type_ == EXIT_DESTROYED) { |
aura::Env::GetInstance()->GetDispatcher()->Dispatch(event); |