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 8b6bd3e82f2200d5c8614c38b0fc0d92797f9408..ad8bf0a0121aa332a0450a383a9a0218b4adafea 100644 |
--- a/ui/views/controls/menu/menu_host_root_view.cc |
+++ b/ui/views/controls/menu/menu_host_root_view.cc |
@@ -62,16 +62,16 @@ bool MenuHostRootView::OnMouseWheel(const ui::MouseWheelEvent& event) { |
#endif |
} |
-ui::EventResult MenuHostRootView::DispatchGestureEvent( |
+void MenuHostRootView::DispatchGestureEvent( |
ui::GestureEvent* event) { |
- ui::EventResult result = RootView::DispatchGestureEvent(event); |
- if (result != ui::ER_UNHANDLED) |
- return result; |
+ RootView::DispatchGestureEvent(event); |
+ if (event->handled()) |
+ return; |
// ChromeOS uses MenuController to forward events like other |
// mouse events. |
if (!GetMenuController()) |
- return ui::ER_UNHANDLED; |
- return GetMenuController()->OnGestureEvent(submenu_, event); |
+ return; |
+ GetMenuController()->OnGestureEvent(submenu_, event); |
} |
MenuController* MenuHostRootView::GetMenuController() { |