summaryrefslogtreecommitdiffstats
path: root/android_webview/java/src
diff options
context:
space:
mode:
authorsgurun@chromium.org <sgurun@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-28 17:56:08 +0000
committersgurun@chromium.org <sgurun@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-28 17:56:08 +0000
commit271357c0e64231a37072e20274acf4686695c791 (patch)
tree13e8f9c75c112c42ddbe19f1aa3cfa8bf885be9f /android_webview/java/src
parentb98d3fc22670cf013d4d68dd55820f636597d394 (diff)
downloadchromium_src-271357c0e64231a37072e20274acf4686695c791.zip
chromium_src-271357c0e64231a37072e20274acf4686695c791.tar.gz
chromium_src-271357c0e64231a37072e20274acf4686695c791.tar.bz2
call onPageFinished when you cancel the ssl error
This fixes the issue introduced by the following code review: https://codereview.chromium.org/68763012/ BUG=337985 R=benm@chromium.org, sgurun@chromium.org Review URL: https://codereview.chromium.org/133273033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/java/src')
-rw-r--r--android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java5
1 files changed, 5 insertions, 0 deletions
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 66e4f1e..4e6fbdd 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java
@@ -55,6 +55,11 @@ public class AwContentsClientBridge {
@Override
public void onReceiveValue(Boolean value) {
proceedSslError(value.booleanValue(), id);
+ if (!value) {
+ // For backward compatibility with the classic
+ // webview, call onPageFinished after canceling ssl error.
+ AwContentsClientBridge.this.mClient.onPageFinished(url);
+ }
}
};
mClient.onReceivedSslError(callback, sslError);