Make RootView::DispatchGestureEvent() non-virtual

ui/views/controls/menu/menu_host_root_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/menu/menu_host_root_view.h"
 
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/submenu_view.h"
 
@@ skipping 37 matching lines @@
   RootView::OnMouseMoved(event);
   if (GetMenuController())
     GetMenuController()->OnMouseMoved(submenu_, event);
 }
 
 bool MenuHostRootView::OnMouseWheel(const ui::MouseWheelEvent& event) {
   return GetMenuController() &&
       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) {
+  // TODO(tdanderson): Instead call up to EventProcessor::OnEventFromSource()
+  //                   once RootView::OnEventFromSource() is removed.

[sadrul, 2014/07/15 18:23:46]

ditto

[tdanderson, 2014/07/15 20:25:40]

Done.

+  ui::EventDispatchDetails result = RootView::OnEventFromSource(event);
+
+  if (event->IsGestureEvent()) {
+    ui::GestureEvent* gesture_event = static_cast<ui::GestureEvent*>(event);
+    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() {
   return submenu_ ? submenu_->GetMenuItem()->GetMenuController() : NULL;
 }
 
 bool MenuHostRootView::DoesEventTargetEmptyMenuItem(
     const ui::MouseEvent& event) {
   View* view = GetEventHandlerForPoint(event.location());
   return view && view->id() == MenuItemView::kEmptyMenuItemViewID;
 }
 
 }  // namespace views