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 ec722f61372f5a2262e32a713e3ac8c725235a1a..2bc9aa3e0a73358757164a705a005bd72d0af5db 100644 |
--- a/android_webview/java/src/org/chromium/android_webview/AwWebContentsObserver.java |
+++ b/android_webview/java/src/org/chromium/android_webview/AwWebContentsObserver.java |
@@ -43,8 +43,8 @@ public class AwWebContentsObserver extends WebContentsObserver { |
} |
@Override |
- public void didFailLoad(boolean isProvisionalLoad, |
- boolean isMainFrame, int errorCode, String description, String failingUrl) { |
+ public void didFailLoad(boolean isProvisionalLoad, boolean isMainFrame, int errorCode, |
+ String description, String failingUrl, boolean wasIgnoredByHandler) { |
AwContentsClient client = mAwContentsClient.get(); |
if (client == null) return; |
String unreachableWebDataUrl = AwContentsStatics.getUnreachableWebDataUrl(); |
@@ -53,7 +53,12 @@ public class AwWebContentsObserver extends WebContentsObserver { |
if (isMainFrame && !isErrorUrl && errorCode == NetError.ERR_ABORTED) { |
// Need to call onPageFinished for backwards compatibility with the classic webview. |
// See also AwContents.IoThreadClientImpl.onReceivedError. |
- client.onPageFinished(failingUrl); |
+ // If the navigation was ignored because of shouldOverrideUrlLoading we have already |
+ // called onPageFinished in |
+ // AwContents.InterceptNavigationDelegateImpl.shouldIgnoreNavigation instead. |
+ if (!wasIgnoredByHandler) { |
mnaganov (inactive)
2015/06/04 19:09:27
nit: Why not to put this condition check into the
gsennton
2015/06/08 14:07:23
Done.
|
+ client.onPageFinished(failingUrl); |
+ } |
} |
} |