content/browser/web_contents/web_contents_impl.cc - Issue 1155713005: Use a resource throttle to implement shouldOverrideUrlLoading.

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 1155713005: Use a resource throttle to implement shouldOverrideUrlLoading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Change XHR test and remove HandleNavigation path. Created 5 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

« android_webview/renderer/aw_content_renderer_client.cc ('K') | « content/browser/web_contents/web_contents_impl.h ('k') | content/child/web_url_loader_impl.cc » ('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 2a8a92c6b93fc5ff7299201af9e88d660da46596..3242e47bd80a365e5452a3557c598d023566b0fc 100644

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

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

@@ -2595,7 +2595,8 @@ void WebContentsImpl::DidFailProvisionalLoadWithError(

DidFailProvisionalLoad(render_frame_host,

validated_url,

params.error_code,

- params.error_description));

+ params.error_description,

+ params.was_ignored_by_handler));

FrameTreeNode* ftn = render_frame_host->frame_tree_node();

BrowserAccessibilityManager* manager =

@@ -2608,11 +2609,13 @@ void WebContentsImpl::DidFailLoadWithError(

RenderFrameHostImpl* render_frame_host,

const GURL& url,

int error_code,

- const base::string16& error_description) {

+ const base::string16& error_description,

+ bool was_ignored_by_handler) {

FOR_EACH_OBSERVER(

WebContentsObserver,

observers_,

- DidFailLoad(render_frame_host, url, error_code, error_description));

+ DidFailLoad(render_frame_host, url, error_code, error_description,

+ was_ignored_by_handler));

}

void WebContentsImpl::NotifyChangedNavigationState(