Remove WebContentsObserver::DidGetUserGesture.

content/browser/renderer_host/render_widget_host_impl.cc

Index: content/browser/renderer_host/render_widget_host_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index baf1cc4c75a4ec24ab4afaa3c1617df86882f133..29b3f66c9537cee4d5ea879a45021a58ece84994 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1133,13 +1133,6 @@ void RenderWidgetHostImpl::ForwardKeyboardEvent(
     return;
   }
 
-  if (key_event.type == WebKeyboardEvent::Char &&
-      (key_event.windowsKeyCode == ui::VKEY_RETURN ||
-       key_event.windowsKeyCode == ui::VKEY_SPACE)) {
-    if (delegate_)
-      delegate_->OnUserGesture(this);
-  }
-
   // Double check the type to make sure caller hasn't sent us nonsense that
   // will mess up our key queue.
   if (!WebInputEvent::isKeyboardEventType(key_event.type))
@@ -1907,21 +1900,15 @@ InputEventAckState RenderWidgetHostImpl::FilterInputEvent(
   if (!process_->HasConnection())
     return INPUT_EVENT_ACK_STATE_UNKNOWN;
 
-  if (event.type == WebInputEvent::MouseDown ||
-      event.type == WebInputEvent::GestureTapDown) {
-    if (delegate_)
-      delegate_->OnUserGesture(this);
-  }
-
   if (delegate_) {
     if (event.type == WebInputEvent::MouseDown ||
         event.type == WebInputEvent::GestureTapDown ||
         event.type == WebInputEvent::RawKeyDown) {
-      delegate_->OnUserInteraction(event.type);
+      delegate_->OnUserInteraction(this, event.type);
     } else if (event.type == WebInputEvent::MouseWheel) {
       if (mouse_wheel_coalesce_timer_->Elapsed().InSecondsF() >

[tdresser, 2016/02/25 14:42:48]

dtapuska@ is working on dispatching gesture events for mousewheel scrolls.
crbug.com/568183.

Once that has landed, we should be able to get rid of the mousewheel timer logic
here, and just listen for GestureScrollBegin.

[dtapuska, 2016/02/25 14:48:58]

Can you please add code for GestureScrollBegin? You can enable the feature via
--enable-wheel-gestures

[dominickn, 2016/02/26 00:36:11]

Thanks for the FYI. It looks like GestureScrollBegin fires for tap-scrolls on
Android; scrolls on mobile seem to send GestureTapDown and then
GestureScrollBegin immediately afterwards. That's a bit sad - is there a way to
distinguish between a tap and a scroll on Android?

I'll add code for GestureScrollBegin in a followup CL that also changes the
clients of this method. It will be better to send GestureScrollBegin as the
event type for scrolling rather than MouseWheel since it fires for Android
scrolling as well; since all of the clients of this method explicitly
handle/ignore scroll events in some way, I'll need to update all of them at
once.

[tdresser, 2016/02/26 13:14:18]

What do you mean GestureScrollBegin fires for "tap-scrolls"?

GestureTapDown just means that the finger hit the page. GestureTap means that a
tap occurred.

GestureScrollBegin should be fired iff the user starts scrolling.

           kMouseWheelCoalesceIntervalInSeconds) {
-        delegate_->OnUserInteraction(event.type);
+        delegate_->OnUserInteraction(this, event.type);
       }
 
       mouse_wheel_coalesce_timer_.reset(new base::ElapsedTimer());