android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java - 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: android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java

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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/AwContentsClient.java ('k') | android_webview/native/aw_contents.cc » ('j') | android_webview/native/aw_contents.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java

diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java b/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java

index 7172cfb23b258f1c61c4596c4bcb11d0202d9b60..9d3a03bb5cd1f02bfec66a906b2bc49e4a5ad268 100644

--- a/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java

+++ b/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java

@@ -91,6 +91,11 @@ public class AwContentsClientBridge {

mClient.handleJsBeforeUnload(url, message, handler);

}

+ @CalledByNative

+ private boolean shouldOverrideUrlLoading(String url) {

+ return mClient.shouldOverrideUrlLoading(url);

+ }

void confirmJsResult(int id, String prompt) {

if (mNativeContentsClientBridge == 0) return;

nativeConfirmJsResult(mNativeContentsClientBridge, id, prompt);