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

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/java/src/org/chromium/android_webview/AwContentsClientBridge.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d9b709a8f4c8c98e33b69aac00ef040183b97a2d..3c08c30ebb24c6462d3018b38025d3842739078f 100644

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

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

@@ -72,16 +72,11 @@ public class AwWebContentsObserver extends WebContentsObserver {

String unreachableWebDataUrl = AwContentsStatics.getUnreachableWebDataUrl();

boolean isErrorUrl =

unreachableWebDataUrl != null && unreachableWebDataUrl.equals(failingUrl);

- if (isMainFrame && !isErrorUrl && errorCode == NetError.ERR_ABORTED

- && !wasIgnoredByHandler) {

+ if (isMainFrame && !isErrorUrl && errorCode == NetError.ERR_ABORTED) {

// Need to call onPageFinished for backwards compatibility with the classic webview.

// See also AwContents.IoThreadClientImpl.onReceivedError.

- // If the navigation was ignored because of shouldOverrideUrlLoading we have already

- // called onPageFinished in

- // AwContents.InterceptNavigationDelegateImpl.shouldIgnoreNavigation instead.

client.getCallbackHelper().postOnPageFinished(failingUrl);

}

- client.onFailedLoadForTesting(failingUrl);

}

@Override