android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc - Issue 481593002: Remove child/route parameters from ShouldBeginRequest and RequestBeginning.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc

Issue 481593002: Remove child/route parameters from ShouldBeginRequest and RequestBeginning. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: android build Created 6 years, 4 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 | « android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h ('k') | chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc

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 f55b36aac95f50e37add07d8180d5d7eef770676..5f672c73e0703f305929f1a46311dfd00158c56e 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

@@ -212,8 +212,6 @@ void AwResourceDispatcherHostDelegate::RequestBeginning(

content::ResourceContext* resource_context,

content::AppCacheService* appcache_service,

ResourceType resource_type,

- int child_id,

- int route_id,

ScopedVector<content::ResourceThrottle>* throttles) {

AddExtraHeadersIfNeeded(request, resource_context);

@@ -227,7 +225,7 @@ void AwResourceDispatcherHostDelegate::RequestBeginning(

// however io_client may or may not be ready at the time depending on whether

// webcontents is created.

throttles->push_back(new IoThreadClientThrottle(

- child_id, request_info->GetRenderFrameID(), request));

+ request_info->GetChildID(), request_info->GetRenderFrameID(), request));

// We allow intercepting only navigations within main frames. This

// is used to post onPageStarted. We handle shouldOverrideUrlLoading