android_webview/native/aw_contents_client_bridge.h - Issue 1530183004: Revert 3 CLs for shouldOverrideUrlLoading implementation.

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/native/aw_contents_client_bridge.h

Issue 1530183004: Revert 3 CLs for shouldOverrideUrlLoading implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase (simple conflict in AwContentsClientShouldOverrideUrlLoadingTest). Created 4 years, 11 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/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java ('k') | android_webview/native/aw_contents_client_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/native/aw_contents_client_bridge.h

diff --git a/android_webview/native/aw_contents_client_bridge.h b/android_webview/native/aw_contents_client_bridge.h

index 5372fb07442793cd7fe35c849aca7a2b17ebc95a..2af63ca25d6f0b726fe480591366912340240b80 100644

--- a/android_webview/native/aw_contents_client_bridge.h

+++ b/android_webview/native/aw_contents_client_bridge.h

@@ -54,6 +54,10 @@ class AwContentsClientBridge : public AwContentsClientBridgeBase {

const base::string16& message_text,

const content::JavaScriptDialogManager::DialogClosedCallback& callback)

override;

+ bool ShouldOverrideUrlLoading(const base::string16& url,

+ bool has_user_gesture,

+ bool is_redirect,

+ bool is_main_frame) override;

// Methods called from Java.

void ProceedSslError(JNIEnv* env,