Restructuring NavigationController functionalities from ContentViewCore to NavigationController

content/public/android/java/src/org/chromium/content_public/browser/NavigationController.java

Index: content/public/android/java/src/org/chromium/content_public/browser/NavigationController.java
diff --git a/content/public/android/java/src/org/chromium/content_public/browser/NavigationController.java b/content/public/android/java/src/org/chromium/content_public/browser/NavigationController.java
index 28a72cab9ebd989ffb3e6504f30c699db2abc955..2016771e7bcd0c38bd8e5516d27ea4beb799ed2a 100644
--- a/content/public/android/java/src/org/chromium/content_public/browser/NavigationController.java
+++ b/content/public/android/java/src/org/chromium/content_public/browser/NavigationController.java
@@ -4,6 +4,9 @@
 
 package org.chromium.content_public.browser;
 
+import org.chromium.content.browser.LoadUrlParams;
+import org.chromium.content.browser.NavigationHistory;
+
 /**
  * The NavigationController Java wrapper to allow communicating with the native
  * NavigationController object.
@@ -77,4 +80,59 @@ public interface NavigationController {
      * Continue the pending reload.
      */
     public void continuePendingReload();
+
+    /**
+     * Load url without fixing up the url string. Consumers of ContentView are responsible for

[Yaron, 2014/07/22 20:49:06]

s/Consumers of ContentView/Clients of NavigationController/

[AKVT, 2014/07/23 11:49:23]

Done.

+     * ensuring the URL passed in is properly formatted (i.e. the scheme has been added if left
+     * off during user input).
+     *
+     * @param params Parameters for this load.
+     */
+    public void loadUrl(LoadUrlParams params);
+
+    /**
+     * Clears the ContentViewCore's page history in both the backwards and

[Yaron, 2014/07/22 20:49:06]

s/ContentViewCore/NavigationController/

[AKVT, 2014/07/23 11:49:23]

Done.

+     * forwards directions.
+     */
+    public void clearHistory();
+
+    /**
+     * Get a copy of the navigation history of the view.

[Yaron, 2014/07/22 20:49:06]

Ok, I'll stop commenting on view-related changes. Please take a look at the rest
of the diff (and comments) and make sure they make sense. There's no notion of a
"view" here.

[AKVT, 2014/07/23 11:49:23]

Done.

+     * @return navigation history of the view.
+     */
+    public NavigationHistory getNavigationHistory();
+
+    /**
+    * Get the navigation history of the view from current navigation entry index
+    * with direction (forward/backward)
+    * @param isForward determines forward or backward from current index
+    * @param itemLimit maximum number of entries to be retrieved in specified
+    * diection.
+    * @return navigation history by keeping above constraints.
+    */
+    public NavigationHistory getDirectedNavigationHistory(boolean isForward, int itemLimit);
+
+    /**
+     * @return The original request URL for the current navigation entry, or null if there is no
+     *         current entry.
+     */
+    public String getOriginalUrlForActiveNavigationEntry();
+
+    /**
+     * Clears SSL preferences for this WebContent Navigation Controller.

[Yaron, 2014/07/22 20:49:06]

s/WebContent//

[AKVT, 2014/07/23 11:49:23]

Done.

+     */
+    public void clearSslPreferences();
+
+    /**
+     * Get whether or not we're using a desktop user agent for the currently loaded page.
+     * @return true, if use a desktop user agent and false for a mobile one.
+     */
+    public boolean getUseDesktopUserAgent();
+
+    /**
+     * Set whether or not we're using a desktop user agent for the currently loaded page.
+     * @param override If true, use a desktop user agent.  Use a mobile one otherwise.
+     * @param reloadOnChange Reload the page if the UA has changed.
+     */
+    public void setUseDesktopUserAgent(boolean override, boolean reloadOnChange);
 }