Restructuring NavigationController functionalities from ContentViewCore to NavigationController

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

Index: content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java b/content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java
similarity index 93%
rename from content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java
rename to content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java
index db484427ac1168dcabae647bd72c8fa2fb80b024..8f3835d21c59d38a421d740c1e3b1e038375a5fb 100644
--- a/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java
+++ b/content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java
@@ -2,17 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.content.browser;
+package org.chromium.content_public.browser;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.content_public.Referrer;
+//import org.chromium.content_public.browser.PageTransitionTypes;

[Yaron, 2014/07/28 22:43:39]

uncomment.

[AKVT, 2014/07/30 14:47:53]

Done.

 
 import java.util.Locale;
 import java.util.Map;
 
 /**
- * Holds parameters for ContentViewCore.LoadUrl. Parameters should match
+ * Holds parameters for NavigationController.LoadUrl. Parameters should match
  * counterparts in NavigationController::LoadURLParams, including default
  * values.
  */
@@ -259,7 +260,7 @@ public class LoadUrlParams {
      * exploded form through setExtraHeaders(). Embedders that work with extra headers in opaque
      * collapsed form can use the setVerbatimHeaders() / getVerbatimHeaders() instead.
      */
-    String getExtraHeadersString() {
+    public String getExtraHeadersString() {
         return getExtraHeadersString("\n", false);
     }
 
@@ -314,6 +315,14 @@ public class LoadUrlParams {
     }
 
     /**
+     * Get user agent override option of this load. Defaults to UA_OVERRIDE_INHERIT.
+     * @param uaOption One of UA_OVERRIDE static constants above.
+     */
+    public int getUserAgentOverrideOption() {
+        return mUaOverrideOption;
+    }
+
+    /**
      * Set the post data of this load. This field is ignored unless load type is
      * LOAD_TYPE_BROWSER_INITIATED_HTTP_POST.
      * @param postData Post data for this http post load.
@@ -340,6 +349,15 @@ public class LoadUrlParams {
     }
 
     /**
+     * Get the virtual url for data load. It is the url displayed to the user.
+     * It is ignored unless load type is LOAD_TYPE_DATA.
+     * @return The virtual url for this data load.
+     */
+    public String getVirtualUrlForDataUrl() {
+        return mVirtualUrlForDataUrl;
+    }
+
+    /**
      * Set the virtual url for data load. It is the url displayed to the user.
      * It is ignored unless load type is LOAD_TYPE_DATA.
      * @param virtualUrl The virtual url for this data load.
@@ -356,6 +374,14 @@ public class LoadUrlParams {
         mCanLoadLocalResources = canLoad;
     }
 
+    /**
+     * Get whether the load should be able to access local resources. This
+     * defaults to false.
+     */
+    public boolean getCanLoadLocalResources() {
+        return mCanLoadLocalResources;
+    }
+
     public int getLoadUrlType() {
         return mLoadUrlType;
     }