Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / ui / views / controls / menu / menu_host_root_view.cc

diff --git a/src/ui/views/controls/menu/menu_host_root_view.cc b/src/ui/views/controls/menu/menu_host_root_view.cc
index 3bce4a4..a46b81b 100644 (file)
--- a/src/ui/views/controls/menu/menu_host_root_view.cc
+++ b/src/ui/views/controls/menu/menu_host_root_view.cc
@@ -55,15 +55,21 @@ bool MenuHostRootView::OnMouseWheel(const ui::MouseWheelEvent& event) {
       GetMenuController()->OnMouseWheel(submenu_, event);
 }
 
-void MenuHostRootView::DispatchGestureEvent(ui::GestureEvent* event) {
-  RootView::DispatchGestureEvent(event);
-  if (event->handled())
-    return;
-  // ChromeOS uses MenuController to forward events like other
-  // mouse events.
-  if (!GetMenuController())
-    return;
-  GetMenuController()->OnGestureEvent(submenu_, event);
+ui::EventDispatchDetails MenuHostRootView::OnEventFromSource(ui::Event* event) {
+  ui::EventDispatchDetails result = RootView::OnEventFromSource(event);
+
+  if (event->IsGestureEvent()) {
+    ui::GestureEvent* gesture_event = event->AsGestureEvent();
+    if (gesture_event->handled())
+      return result;
+    // ChromeOS uses MenuController to forward events like other
+    // mouse events.
+    if (!GetMenuController())
+      return result;
+    GetMenuController()->OnGestureEvent(submenu_, gesture_event);
+  }
+
+  return result;
 }
 
 MenuController* MenuHostRootView::GetMenuController() {