diff options
| author | csharrison <csharrison@chromium.org> | 2016-01-08 07:50:46 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-08 15:51:39 +0000 |
| commit | 50bc42605ded9d59e9a3086ae9c4f402540553ab (patch) | |
| tree | 1d358502ef5e98a6f752d30479f0a6d30f195713 /android_webview | |
| parent | a90394da471d870bf4e7717b3ecc3bd91535352b (diff) | |
| download | chromium_src-50bc42605ded9d59e9a3086ae9c4f402540553ab.zip chromium_src-50bc42605ded9d59e9a3086ae9c4f402540553ab.tar.gz chromium_src-50bc42605ded9d59e9a3086ae9c4f402540553ab.tar.bz2 | |
Let HandleExternalProtocol use a WebContents callback rather than RVID
It ends up referring to a tab_id, which is better to come off the WebContents itself.
BUG=392171
Review URL: https://codereview.chromium.org/1533073005
Cr-Commit-Position: refs/heads/master@{#368336}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc | 2 | ||||
| -rw-r--r-- | android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h | 14 |
2 files changed, 9 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 f4d3190..93045f3 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 @@ -307,7 +307,7 @@ content::ResourceDispatcherHostLoginDelegate* bool AwResourceDispatcherHostDelegate::HandleExternalProtocol( const GURL& url, int child_id, - int route_id, + const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter, bool is_main_frame, ui::PageTransition page_transition, bool has_user_gesture) { 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 4017ef0..651f6e7 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 @@ -48,12 +48,14 @@ class AwResourceDispatcherHostDelegate content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate( net::AuthChallengeInfo* auth_info, net::URLRequest* request) override; - bool HandleExternalProtocol(const GURL& url, - int child_id, - int route_id, - bool is_main_frame, - ui::PageTransition page_transition, - bool has_user_gesture) override; + bool HandleExternalProtocol( + const GURL& url, + int child_id, + const content::ResourceRequestInfo::WebContentsGetter& + web_contents_getter, + bool is_main_frame, + ui::PageTransition page_transition, + bool has_user_gesture) override; void OnResponseStarted(net::URLRequest* request, content::ResourceContext* resource_context, content::ResourceResponse* response, |