diff options
| author | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-26 01:22:23 +0000 |
|---|---|---|
| committer | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-26 01:22:23 +0000 |
| commit | 9e6cdf81371ea8d0222414f18f998de5d2be07a1 (patch) | |
| tree | d865d6054a0e3058e6c2ea4775e5e8f43a2c4185 /content/browser/android | |
| parent | 757a997c35ddecdb8fd66fb8f760d1098257a4ae (diff) | |
| download | chromium_src-9e6cdf81371ea8d0222414f18f998de5d2be07a1.zip chromium_src-9e6cdf81371ea8d0222414f18f998de5d2be07a1.tar.gz chromium_src-9e6cdf81371ea8d0222414f18f998de5d2be07a1.tar.bz2 | |
Expose DidCommitProvisionalLoadForFrame to Android's java observer.
BUG=161303
Review URL: https://chromiumcodereview.appspot.com/12316082
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android')
| -rw-r--r-- | content/browser/android/web_contents_observer_android.cc | 17 | ||||
| -rw-r--r-- | content/browser/android/web_contents_observer_android.h | 6 |
2 files changed, 23 insertions, 0 deletions
diff --git a/content/browser/android/web_contents_observer_android.cc b/content/browser/android/web_contents_observer_android.cc index 92cce79..a915fd6 100644 --- a/content/browser/android/web_contents_observer_android.cc +++ b/content/browser/android/web_contents_observer_android.cc @@ -156,6 +156,23 @@ void WebContentsObserverAndroid::DidStartProvisionalLoadForFrame( jstring_url.obj(), is_error_page, is_iframe_srcdoc); } +void WebContentsObserverAndroid::DidCommitProvisionalLoadForFrame( + int64 frame_id, + bool is_main_frame, + const GURL& url, + PageTransition transition_type, + RenderViewHost* render_view_host) { + JNIEnv* env = AttachCurrentThread(); + ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env)); + if (obj.is_null()) + return; + ScopedJavaLocalRef<jstring> jstring_url( + ConvertUTF8ToJavaString(env, url.spec())); + Java_WebContentsObserverAndroid_didCommitProvisionalLoadForFrame( + env, obj.obj(), frame_id, is_main_frame, jstring_url.obj(), + transition_type); +} + void WebContentsObserverAndroid::DidFinishLoad( int64 frame_id, const GURL& validated_url, diff --git a/content/browser/android/web_contents_observer_android.h b/content/browser/android/web_contents_observer_android.h index ea7f55f..52f30da 100644 --- a/content/browser/android/web_contents_observer_android.h +++ b/content/browser/android/web_contents_observer_android.h @@ -58,6 +58,12 @@ class WebContentsObserverAndroid : public WebContentsObserver { bool is_error_page, bool is_iframe_srcdoc, RenderViewHost* render_view_host) OVERRIDE; + virtual void DidCommitProvisionalLoadForFrame( + int64 frame_id, + bool is_main_frame, + const GURL& url, + PageTransition transition_type, + RenderViewHost* render_view_host) OVERRIDE; virtual void DidFinishLoad(int64 frame_id, const GURL& validated_url, bool is_main_frame, |