Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / frame / browser_root_view.cc

diff --git a/src/chrome/browser/ui/views/frame/browser_root_view.cc b/src/chrome/browser/ui/views/frame/browser_root_view.cc
index 6ac54d9..f25434e 100644 (file)
--- a/src/chrome/browser/ui/views/frame/browser_root_view.cc
+++ b/src/chrome/browser/ui/views/frame/browser_root_view.cc
@@ -6,7 +6,6 @@
 
 #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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -16,6 +15,7 @@
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/touch_uma/touch_uma.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
+#include "components/omnibox/autocomplete_match.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/hit_test.h"
@@ -151,14 +151,17 @@ bool BrowserRootView::OnMouseWheel(const ui::MouseWheelEvent& event) {
   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 = event->AsGestureEvent();
+    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);
+  return RootView::OnEventFromSource(event);
 }
 
 bool BrowserRootView::ShouldForwardToTabStrip(