Make RootView::DispatchGestureEvent() non-virtual

chrome/browser/ui/views/frame/browser_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 "chrome/browser/ui/views/frame/browser_root_view.h"
 
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/defaults.h"
@@ skipping 133 matching lines @@
       // tab-strip.
       if (scroll_offset > 0 && model->active_index() > 0) {
         chrome::SelectPreviousTab(browser);
         return true;
       }
     }
   }
   return RootView::OnMouseWheel(event);
 }
 
-void BrowserRootView::DispatchGestureEvent(ui::GestureEvent* event) {
-  if (event->type() == ui::ET_GESTURE_TAP &&
-      event->location().y() <= 0 &&
-      event->location().x() <= browser_view_->GetBounds().width()) {
-    TouchUMA::RecordGestureAction(TouchUMA::GESTURE_ROOTVIEWTOP_TAP);
+ui::EventDispatchDetails BrowserRootView::OnEventFromSource(ui::Event* event) {
+  if (event->IsGestureEvent()) {
+    ui::GestureEvent* gesture_event = static_cast<ui::GestureEvent*>(event);
+    if (gesture_event->type() == ui::ET_GESTURE_TAP &&
+        gesture_event->location().y() <= 0 &&
+        gesture_event->location().x() <= browser_view_->GetBounds().width()) {
+      TouchUMA::RecordGestureAction(TouchUMA::GESTURE_ROOTVIEWTOP_TAP);
+    }
   }
 
-  RootView::DispatchGestureEvent(event);
+  // TODO(tdanderson): Instead call up to EventProcessor::OnEventFromSource()
+  //                   once RootView::OnEventFromSource() is removed.

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

You can actually leave this as it is when you remove
RootView::OnEventFromSource(), and it will do the right thing.

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

Right, I just thought it would be slightly better for readability if the name
matched the parent class that actually contains the implementation. But now that
I think about it, I should probably leave this as RootView:: anyway for some
possible future scenario where RootView or View overrides OnEventFromSource().

Removed the TODO.

+  return RootView::OnEventFromSource(event);
 }
 
 bool BrowserRootView::ShouldForwardToTabStrip(
     const ui::DropTargetEvent& event) {
   if (!tabstrip()->visible())
     return false;
 
   // Allow the drop as long as the mouse is over the tabstrip or vertically
   // before it.
   gfx::Point tab_loc_in_host;
@@ skipping 29 matching lines @@
       browser_view_->browser()->profile())->Classify(
           text, false, false, metrics::OmniboxEventProto::INVALID_SPEC, &match,
           NULL);
   if (!match.destination_url.is_valid())
     return false;
 
   if (url)
     *url = match.destination_url;
   return true;
 }