Remove WebContentsObserver::DidGetUserGesture.

content/browser/renderer_host/render_widget_host_impl.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 "content/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 #include <set>
 #include <utility>
 
@@ skipping 1115 matching lines @@
   // First, let keypress listeners take a shot at handling the event.  If a
   // listener handles the event, it should not be propagated to the renderer.
   if (KeyPressListenersHandleEvent(key_event)) {
     // Some keypresses that are accepted by the listener might have follow up
     // char events, which should be ignored.
     if (key_event.type == WebKeyboardEvent::RawKeyDown)
       suppress_next_char_events_ = true;
     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))
     return;
 
   if (suppress_next_char_events_) {
     // If preceding RawKeyDown event was handled by the browser, then we need
     // suppress all Char events generated by it. Please note that, one
     // RawKeyDown event may generate multiple Char events, so we can't reset
     // |suppress_next_char_events_| until we get a KeyUp or a RawKeyDown.
@@ skipping 747 matching lines @@
     const blink::WebInputEvent& event, const ui::LatencyInfo& latency_info) {
   // Don't ignore touch cancel events, since they may be sent while input
   // events are being ignored in order to keep the renderer from getting
   // confused about how many touches are active.
   if (ShouldDropInputEvents() && event.type != WebInputEvent::TouchCancel)
     return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
 
   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());
     }
   }
 
   return view_ ? view_->FilterInputEvent(event)
                : INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
 }
 
@@ skipping 318 matching lines @@
 }
 
 #if defined(OS_WIN)
 gfx::NativeViewAccessible
     RenderWidgetHostImpl::GetParentNativeViewAccessible() {
   return delegate_ ? delegate_->GetParentNativeViewAccessible() : NULL;
 }
 #endif
 
 }  // namespace content