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

content/browser/loader/resource_dispatcher_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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 
 #include <algorithm>
 #include <set>
@@ skipping 647 matching lines @@
 ResourceDispatcherHostLoginDelegate*
 ResourceDispatcherHostImpl::CreateLoginDelegate(
     ResourceLoader* loader,
     net::AuthChallengeInfo* auth_info) {
   if (!delegate_)
     return NULL;
 
   return delegate_->CreateLoginDelegate(auth_info, loader->request());
 }
 
+bool RequestHasRecentUserGesture(const net::URLRequest* request) {

[mmenke, 2014/03/31 14:38:42]

This should probably just be RequestWasTriggeredByUserGesture.  The request may
no longer be recent by the time we're checking the load flags.

Alternatively, could just inline this function.  Not sure having a function for
this really gets us anything.

[mmenke, 2014/03/31 14:38:42]

This should be in the anonymous namespace up top.

[meacer, 2014/03/31 18:32:30]

Inlined.

+  return (request->load_flags() & net::LOAD_MAYBE_USER_GESTURE) != 0;
+}
+
 bool ResourceDispatcherHostImpl::HandleExternalProtocol(ResourceLoader* loader,
                                                         const GURL& url) {
   if (!delegate_)
     return false;
 
   ResourceRequestInfoImpl* info = loader->GetRequestInfo();
 
   if (!ResourceType::IsFrame(info->GetResourceType()))
     return false;
 
   const net::URLRequestJobFactory* job_factory =
       info->GetContext()->GetRequestContext()->job_factory();
   if (job_factory->IsHandledURL(url))
     return false;
 
-  return delegate_->HandleExternalProtocol(url, info->GetChildID(),
-                                           info->GetRouteID());
+  bool user_gesture = RequestHasRecentUserGesture(loader->request());
+  bool handled = delegate_->HandleExternalProtocol(url, info->GetChildID(),
+                                                   info->GetRouteID(),
+                                                   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) {
   // Make sure we have the load state monitor running
   if (!update_load_states_timer_->IsRunning()) {
     update_load_states_timer_->Start(FROM_HERE,
         TimeDelta::FromMilliseconds(kUpdateLoadStatesIntervalMsec),
         this, &ResourceDispatcherHostImpl::UpdateLoadStates);
   }
 }
@@ skipping 1333 matching lines @@
   if ((load_flags & net::LOAD_REPORT_RAW_HEADERS)
       && !policy->CanReadRawCookies(child_id)) {
     VLOG(1) << "Denied unauthorized request for raw headers";
     load_flags &= ~net::LOAD_REPORT_RAW_HEADERS;
   }
 
   return load_flags;
 }
 
 }  // namespace content