content/browser/web_contents/web_contents_impl.cc - Issue 10310124: Implement a ResourceThrottle for URL overriding in Chrome on Android.

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: content/browser/web_contents/web_contents_impl.cc

Issue 10310124: Implement a ResourceThrottle for URL overriding in Chrome on Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: moved back to src/chrome, not using WebContentsDelegate Created 8 years, 6 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

« chrome/browser/renderer_host/intercept_navigation_resource_throttle.cc ('K') | « content/browser/renderer_host/resource_request_info_impl.cc ('k') | content/public/browser/render_view_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index c077141da592cd1dfa10f67fda809fb462f64908..826f61118083b5e2fdd2f8b86984ae2e6e0d43e2 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -1780,13 +1780,11 @@ void WebContentsImpl::DidStartProvisionalLoadForFrame(

GURL validated_opener_url(opener_url);

content::RenderProcessHost* render_process_host =

render_view_host->GetProcess();

- RenderViewHostImpl::FilterURL(

- ChildProcessSecurityPolicyImpl::GetInstance(),

+ RenderViewHost::FilterURL(

render_process_host->GetID(),

false,

&validated_url);

- RenderViewHostImpl::FilterURL(

- ChildProcessSecurityPolicyImpl::GetInstance(),

+ RenderViewHost::FilterURL(

render_process_host->GetID(),

true,

&validated_opener_url);

@@ -1864,8 +1862,7 @@ void WebContentsImpl::DidFailProvisionalLoadWithError(

GURL validated_url(params.url);

content::RenderProcessHost* render_process_host =

render_view_host->GetProcess();

- RenderViewHostImpl::FilterURL(

- ChildProcessSecurityPolicyImpl::GetInstance(),

+ RenderViewHost::FilterURL(

render_process_host->GetID(),

false,

&validated_url);