diff options
| author | meacer@chromium.org <meacer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 21:39:27 +0000 |
|---|---|---|
| committer | meacer@chromium.org <meacer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 21:39:27 +0000 |
| commit | 86fad30d1d885f3b493510bd7e94342fe2a8f086 (patch) | |
| tree | 5c62578824d6a24dd83bc32fc80af456894d1c12 /android_webview | |
| parent | 4b5d64c1b21f6345a21ad330d07bb9546e87b986 (diff) | |
| download | chromium_src-86fad30d1d885f3b493510bd7e94342fe2a8f086.zip chromium_src-86fad30d1d885f3b493510bd7e94342fe2a8f086.tar.gz chromium_src-86fad30d1d885f3b493510bd7e94342fe2a8f086.tar.bz2 | |
Revert of Fix the handling of user gestures for external protocol handler dialogs. (https://codereview.chromium.org/131783012/)
Reason for revert:
This change broke certain cases where external protocol handlers are launched. Consider relanding depending on whether http://crbug.com/78592 is to be fixed.
Original issue's description:
> 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
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=261014
TBR=boliu@chromium.org
Review URL: https://codereview.chromium.org/426713002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286301 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc | 8 | ||||
| -rw-r--r-- | android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h | 3 |
2 files changed, 4 insertions, 7 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 d46b45f..981acf5 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 @@ -299,11 +299,9 @@ content::ResourceDispatcherHostLoginDelegate* return new AwLoginDelegate(auth_info, request); } -bool AwResourceDispatcherHostDelegate::HandleExternalProtocol( - const GURL& url, - int child_id, - int route_id, - bool initiated_by_user_gesture) { +bool AwResourceDispatcherHostDelegate::HandleExternalProtocol(const GURL& url, + int child_id, + int route_id) { // 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 55e61c8..40a05e9 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,8 +51,7 @@ class AwResourceDispatcherHostDelegate net::URLRequest* request) OVERRIDE; virtual bool HandleExternalProtocol(const GURL& url, int child_id, - int route_id, - bool initiated_by_user_gesture) OVERRIDE; + int route_id) OVERRIDE; virtual void OnResponseStarted( net::URLRequest* request, content::ResourceContext* resource_context, |