Restructuring NavigationController functionalities from ContentViewCore to NavigationController

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // 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.
  */
 @JNINamespace("content")
 public class LoadUrlParams {
     // Should match NavigationController::LoadUrlType exactly. See comments
     // there for proper usage. initializeConstants() checks that the values
     // are correct.
     public static final int LOAD_TYPE_DEFAULT = 0;
     public static final int LOAD_TYPE_BROWSER_INITIATED_HTTP_POST = 1;
@@ skipping 226 matching lines @@
         return mExtraHeaders;
     }
 
     /**
      * Return the extra headers as a single String separated by "\n", or null if no extra header is
      * set. This form is suitable for passing to native
      * NavigationController::LoadUrlParams::extra_headers. This will return the headers set in an
      * 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);
     }
 
     /**
      * Return the extra headers as a single String separated by "\r\n", or null if no extra header
      * is set. This form is suitable for passing to native
      * net::HttpRequestHeaders::AddHeadersFromString.
      */
     public String getExtraHttpRequestHeadersString() {
         return getExtraHeadersString("\r\n", true);
@@ skipping 34 matching lines @@
 
     /**
      * Set user agent override option of this load. Defaults to UA_OVERRIDE_INHERIT.
      * @param uaOption One of UA_OVERRIDE static constants above.
      */
     public void setOverrideUserAgent(int uaOption) {
         mUaOverrideOption = uaOption;
     }
 
     /**
+     * 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.
      */
     public void setPostData(byte[] postData) {
         mPostData = postData;
     }
 
     /**
      * @return the data to be sent through POST
      */
     public byte[] getPostData() {
         return mPostData;
     }
 
     /**
      * Set the base url for data load. It is used both to resolve relative URLs
      * and when applying JavaScript's same origin policy. It is ignored unless
      * load type is LOAD_TYPE_DATA.
      * @param baseUrl The base url for this data load.
      */
     public void setBaseUrlForDataUrl(String baseUrl) {
         mBaseUrlForDataUrl = baseUrl;
     }
 
     /**
+     * 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.
      */
     public void setVirtualUrlForDataUrl(String virtualUrl) {
         mVirtualUrlForDataUrl = virtualUrl;
     }
 
     /**
      * Set whether the load should be able to access local resources. This
      * defaults to false.
      */
     public void setCanLoadLocalResources(boolean canLoad) {
         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;
     }
 
     /**
      * @param rendererInitiated Whether or not this load was initiated from a renderer.
      */
     public void setIsRendererInitiated(boolean rendererInitiated) {
         mIsRendererInitiated = rendererInitiated;
     }
@@ skipping 30 matching lines @@
         assert UA_OVERRIDE_FALSE == ua_override_false;
         assert UA_OVERRIDE_TRUE == ua_override_true;
     }
 
     /**
      * Parses |url| as a GURL on the native side, and
      * returns true if it's scheme is data:.
      */
     private static native boolean nativeIsDataScheme(String url);
 }