summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authormeacer@chromium.org <meacer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-02 00:55:19 +0000
committermeacer@chromium.org <meacer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-02 00:55:19 +0000
commitc4b6c85962e5c1dca60c2fc08c75abd52dbd6f01 (patch)
treee6912608ee6e6beb8d53138d33131915c179c9f5 /android_webview
parent94ec440e77ad0b84608869d98b4ec92e7834ced1 (diff)
downloadchromium_src-c4b6c85962e5c1dca60c2fc08c75abd52dbd6f01.zip
chromium_src-c4b6c85962e5c1dca60c2fc08c75abd52dbd6f01.tar.gz
chromium_src-c4b6c85962e5c1dca60c2fc08c75abd52dbd6f01.tar.bz2
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
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc8
-rw-r--r--android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h3
2 files changed, 7 insertions, 4 deletions
diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
index 00b6e60..05eb520 100644
--- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
+++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
@@ -298,9 +298,11 @@ content::ResourceDispatcherHostLoginDelegate*
return new AwLoginDelegate(auth_info, request);
}
-bool AwResourceDispatcherHostDelegate::HandleExternalProtocol(const GURL& url,
- int child_id,
- int route_id) {
+bool AwResourceDispatcherHostDelegate::HandleExternalProtocol(
+ const GURL& url,
+ int child_id,
+ int route_id,
+ bool initiated_by_user_gesture) {
// The AwURLRequestJobFactory implementation should ensure this method never
// gets called.
NOTREACHED();
diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h
index e584c40..8702b09 100644
--- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h
+++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h
@@ -51,7 +51,8 @@ class AwResourceDispatcherHostDelegate
net::URLRequest* request) OVERRIDE;
virtual bool HandleExternalProtocol(const GURL& url,
int child_id,
- int route_id) OVERRIDE;
+ int route_id,
+ bool initiated_by_user_gesture) OVERRIDE;
virtual void OnResponseStarted(
net::URLRequest* request,
content::ResourceContext* resource_context,