summaryrefslogtreecommitdiffstats
path: root/android_webview/java
diff options
context:
space:
mode:
authormkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 19:06:32 +0000
committermkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 19:06:32 +0000
commit1fdb97b0c4837c0af22e678e48e411d272f1e9d0 (patch)
tree9df655cfd4705b91e979567732ffd5033b9a5527 /android_webview/java
parenta9a704121133fa135988ffd57ee2656d1e8ab942 (diff)
downloadchromium_src-1fdb97b0c4837c0af22e678e48e411d272f1e9d0.zip
chromium_src-1fdb97b0c4837c0af22e678e48e411d272f1e9d0.tar.gz
chromium_src-1fdb97b0c4837c0af22e678e48e411d272f1e9d0.tar.bz2
[android_webview] Don't call onPageFinished for history API.
Turns out the refactoring in r158146 made us use the incorrect WebContentsObserver callback. BUG=https://code.google.com/p/android/issues/detail?id=62100, b/11656658 TEST=AndroidWebViewTest Review URL: https://codereview.chromium.org/68763012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235785 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/java')
-rw-r--r--android_webview/java/src/org/chromium/android_webview/AwContentsClient.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
index 3baa767..26f7c6d 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
@@ -58,8 +58,9 @@ public abstract class AwContentsClient {
}
@Override
- public void didStopLoading(String url) {
- AwContentsClient.this.onPageFinished(url);
+ public void didFinishLoad(long frameId, String validatedUrl, boolean isMainFrame) {
+ if (isMainFrame)
+ AwContentsClient.this.onPageFinished(validatedUrl);
}
@Override