Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(894)

Unified Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 131783012: Fix the handling of user gestures for external protocol handler dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: joi and pkasting comments Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/loader/resource_dispatcher_host_impl.cc
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 119995707da204e904422217349d37c0dea528bb..089ccea684578c241dd0b397e77d5e5643864b67 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -665,6 +665,10 @@ ResourceDispatcherHostImpl::CreateLoginDelegate(
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 RequestWasTriggeredBy
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_)
@@ -680,8 +684,14 @@ bool ResourceDispatcherHostImpl::HandleExternalProtocol(ResourceLoader* loader,
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) {

Powered by Google App Engine
This is Rietveld 408576698