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

3 files changed, 38 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,
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 1aafe6e..0cdec43 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
@@ -86,6 +86,21 @@ public abstract class WebContentsObserverAndroid {
     }
 
     /**
+     * Notifies that the provisional load was successfully committed. The RenderViewHost is now
+     * the current RenderViewHost of the WebContents.
+     * @param frameId A positive, non-zero integer identifying the navigating frame.
+     * @param isMainFrame Whether the load is happening for the main frame.
+     * @param url The committed URL being navigated to.
+     * @param transitionType The transition type as defined in
+     *                      {@link org.chromium.content.browser.PageTransitionTypes} for the load.
+     */
+    @CalledByNative
+    public void didCommitProvisionalLoadForFrame(
+            long frameId, boolean isMainFrame, String url, int transitionType) {
+
+    }
+
+    /**
      * Notifies that a load has finished for a given frame.
      * @param frameId A positive, non-zero integer identifying the navigating frame.
      * @param validatedUrl The validated URL that is being navigated to.