Implement doUpdateVisitedHistory callback

Convert WebContentsObserver::didNavigateAnyFrame callback to
doUpdateVisitedHistory callback for WebView.

BUG=


Review URL: https://chromiumcodereview.appspot.com/11567019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173041 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 26 insertions, 1 deletions

diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index 9ad2f95..eefb3af 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -58,12 +58,13 @@ import java.lang.annotation.Annotation;
 public class ContentViewCore implements MotionEventDelegate {
     private static final String TAG = ContentViewCore.class.getName();
 
-    // The following constants match the ones in chrome/common/page_transition_types.h.
+    // The following constants match the ones in content/public/common/page_transition_types.h
     // Add more if you need them.
     public static final int PAGE_TRANSITION_LINK = 0;
     public static final int PAGE_TRANSITION_TYPED = 1;
     public static final int PAGE_TRANSITION_AUTO_BOOKMARK = 2;
     public static final int PAGE_TRANSITION_START_PAGE = 6;
+    public static final int PAGE_TRANSITION_RELOAD = 8;
 
     // Used when ContentView implements a standalone View.
     public static final int PERSONALITY_VIEW = 0;
diff --git a/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java b/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java
index 72a2fb1..24d153f 100644
--- a/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java
+++ b/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java
@@ -120,6 +120,13 @@ public class LoadUrlParams {
     }
 
     /**
+     * Return the url.
+     */
+    public String getUrl() {
+        return mUrl;
+    }
+
+    /**
      * Set load type of this load. Defaults to LOAD_TYPE_DEFAULT.
      * @param loadType One of LOAD_TYPE static constants above.
      */
@@ -136,6 +143,13 @@ public class LoadUrlParams {
     }
 
     /**
+     * Return the transition type.
+     */
+    public int getTransitionType() {
+        return mTransitionType;
+    }
+
+    /**
      * Set user agent override option of this load. Defaults to UA_OVERRIDE_INHERIT.
      * @param uaOption One of UA_OVERRIDE static constants above.
      */
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 c8822911..4f1ea8c 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
@@ -56,6 +56,16 @@ public abstract class WebContentsObserverAndroid {
     }
 
     /**
+     * Similar to didNavigateMainFrame but also called on subframe navigations.
+     * @param url The validated url for the page.
+     * @param baseUrl The validated base url for the page.
+     * @param isReload True if this navigation is a reload.
+     */
+    @CalledByNative
+    public void didNavigateAnyFrame(String url, String baseUrl, boolean isReload) {
+    }
+
+    /**
      * Destroy the corresponding native object.
      */
     @CalledByNative