content/renderer/render_view_impl.cc - Issue 24228003: Upstream ShouldOverrideUrlLoading changes

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/renderer/render_view_impl.cc

Issue 24228003: Upstream ShouldOverrideUrlLoading changes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add a forgotten merge reject Created 7 years, 2 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:

Index: content/renderer/render_view_impl.cc

diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc

index d853f4c81b900827da5e99c50631b0e7a34bbccc..e1fd367f21118b5397ce9b3cee449433c2a45fb2 100644

--- a/content/renderer/render_view_impl.cc

+++ b/content/renderer/render_view_impl.cc

@@ -3161,9 +3161,14 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation(

const WebURLRequest& request, WebNavigationType type,

WebNavigationPolicy default_policy, bool is_redirect) {

if (request.url() != GURL(kSwappedOutURL) &&

- GetContentClient()->renderer()->HandleNavigation(frame, request, type,

- default_policy,

- is_redirect)) {

+ GetContentClient()->renderer()->HandleNavigation(

+ this,

+ static_cast<DocumentState*>(extraData),

+ opener_id_,

+ frame,

+ request, type,

+ default_policy,

+ is_redirect)) {

return WebKit::WebNavigationPolicyIgnore;

}