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

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: Remove unnecessary DCHECK 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
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | content/public/browser/resource_dispatcher_host_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 923431582ceb0ce4d5575d7bae386ac35d74e166..574122e2b2723875f2671bc7f5579196c5506b66 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) {
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | content/public/browser/resource_dispatcher_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698