Fix the handling of user gestures for external protocol handler dialogs.

- Remove browser state from external protocol handler.
- Use gesture with a timeout.

BUG=173557

Review URL: https://codereview.chromium.org/131783012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261014 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 2 deletions

diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 61fc35b..c5e067d 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -679,8 +679,15 @@ bool ResourceDispatcherHostImpl::HandleExternalProtocol(ResourceLoader* loader,
   if (job_factory->IsHandledURL(url))
     return false;
 
-  return delegate_->HandleExternalProtocol(url, info->GetChildID(),
-                                           info->GetRouteID());
+  bool initiated_by_user_gesture =
+      (loader->request()->load_flags() & net::LOAD_MAYBE_USER_GESTURE) != 0;
+  bool handled = delegate_->HandleExternalProtocol(url, info->GetChildID(),
+                                                   info->GetRouteID(),
+                                                   initiated_by_user_gesture);
+  // Consume the user gesture if the external protocol dialog is shown.
+  if (handled)
+    last_user_gesture_time_ = base::TimeTicks();
+  return handled;
 }
 
 void ResourceDispatcherHostImpl::DidStartRequest(ResourceLoader* loader) {