content/browser/android/web_contents_observer_proxy.h - 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/android/web_contents_observer_proxy.h

Issue 1155713005: Use a resource throttle to implement shouldOverrideUrlLoading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add flag showing that shouldOverrideUrl cancelled the navigation Created 5 years, 7 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') | « android_webview/renderer/aw_content_renderer_client.cc ('k') | content/browser/android/web_contents_observer_proxy.cc » ('j') | content/child/web_url_request_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/web_contents_observer_proxy.h

diff --git a/content/browser/android/web_contents_observer_proxy.h b/content/browser/android/web_contents_observer_proxy.h

index 0f21400a4aecb8becdc78c0bcda829bdd7c9fe49..f985041049991bfdd96564ce233298d7961af47e 100644

--- a/content/browser/android/web_contents_observer_proxy.h

+++ b/content/browser/android/web_contents_observer_proxy.h

@@ -37,11 +37,13 @@ class WebContentsObserverProxy : public WebContentsObserver {

void DidFailProvisionalLoad(RenderFrameHost* render_frame_host,

const GURL& validated_url,

int error_code,

- const base::string16& error_description) override;

+ const base::string16& error_description,

+ bool was_ignored_by_handler) override;

void DidFailLoad(RenderFrameHost* render_frame_host,

const GURL& validated_url,

int error_code,

- const base::string16& error_description) override;

+ const base::string16& error_description,

+ bool was_ignored_by_handler) override;

void DidNavigateMainFrame(const LoadCommittedDetails& details,

const FrameNavigateParams& params) override;

void DidNavigateAnyFrame(RenderFrameHost* render_frame_host,

@@ -74,7 +76,8 @@ class WebContentsObserverProxy : public WebContentsObserver {

bool is_main_frame,

int error_code,

const base::string16& description,

- const GURL& url);

+ const GURL& url,

+ bool was_ignored_by_handler);

base::android::ScopedJavaGlobalRef<jobject> java_observer_;