diff options
| author | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-24 03:56:03 +0000 |
|---|---|---|
| committer | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-24 03:56:03 +0000 |
| commit | 7714795f55bf21f3e9859c791cc72dc069ea8941 (patch) | |
| tree | 7cac20622e19e4339cc5f105191e403598652217 /content | |
| parent | f1bd3699219d581a8abcb7dd80043d6aceca5339 (diff) | |
| download | chromium_src-7714795f55bf21f3e9859c791cc72dc069ea8941.zip chromium_src-7714795f55bf21f3e9859c791cc72dc069ea8941.tar.gz chromium_src-7714795f55bf21f3e9859c791cc72dc069ea8941.tar.bz2 | |
Add isNavigationToDifferentPage to didNavigateMainFrame for Android.
BUG=165317
Review URL: https://chromiumcodereview.appspot.com/12805009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/android/web_contents_observer_android.cc | 6 | ||||
| -rw-r--r-- | content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/content/browser/android/web_contents_observer_android.cc b/content/browser/android/web_contents_observer_android.cc index a915fd6..b1cc1c6 100644 --- a/content/browser/android/web_contents_observer_android.cc +++ b/content/browser/android/web_contents_observer_android.cc @@ -10,10 +10,11 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" +#include "base/android/scoped_java_ref.h" #include "content/browser/android/content_view_core_impl.h" #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h" -#include "base/android/scoped_java_ref.h" +#include "content/public/browser/navigation_details.h" #include "jni/WebContentsObserverAndroid_jni.h" using base::android::AttachCurrentThread; @@ -117,7 +118,8 @@ void WebContentsObserverAndroid::DidNavigateMainFrame( ScopedJavaLocalRef<jstring> jstring_base_url( ConvertUTF8ToJavaString(env, params.base_url.spec())); Java_WebContentsObserverAndroid_didNavigateMainFrame( - env, obj.obj(), jstring_url.obj(), jstring_base_url.obj()); + env, obj.obj(), jstring_url.obj(), jstring_base_url.obj(), + details.is_navigation_to_different_page()); } void WebContentsObserverAndroid::DidNavigateAnyFrame( diff --git a/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java b/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java index 0cdec43..bcd7e00 100644 --- a/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java +++ b/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java @@ -50,9 +50,11 @@ public abstract class WebContentsObserverAndroid { * Called when the main frame of the page has committed. * @param url The validated url for the page. * @param baseUrl The validated base url for the page. + * @param isNavigationToDifferentPage Whether the main frame navigated to a different page. */ @CalledByNative - public void didNavigateMainFrame(String url, String baseUrl) { + public void didNavigateMainFrame(String url, String baseUrl, + boolean isNavigationToDifferentPage) { } /** |