Restructuring NavigationController functionalities from ContentViewCore to NavigationController

content/browser/frame_host/navigation_controller_android.h

Index: content/browser/frame_host/navigation_controller_android.h
diff --git a/content/browser/frame_host/navigation_controller_android.h b/content/browser/frame_host/navigation_controller_android.h
index 5d31348464b4146f6df915a1ddf15f074b49243d..b224ecc6dfcbc8174aa22d725d0f615321eb2c1b 100644
--- a/content/browser/frame_host/navigation_controller_android.h
+++ b/content/browser/frame_host/navigation_controller_android.h
@@ -11,6 +11,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "content/common/content_export.h"
+#include "content/public/browser/navigation_controller.h"
 
 namespace content {
 
@@ -46,6 +47,38 @@ class CONTENT_EXPORT NavigationControllerAndroid {
   void RequestRestoreLoad(JNIEnv* env, jobject obj);
   void CancelPendingReload(JNIEnv* env, jobject obj);
   void GoToNavigationIndex(JNIEnv* env, jobject obj, jint index);
+  void LoadUrl(NavigationController::LoadURLParams& params);

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

remove

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

Done.

+  void LoadUrl(
+         JNIEnv* env, jobject obj,
+         jstring url,
+         jint load_url_type,
+         jint transition_type,
+         jstring j_referrer_url,
+         jint referrer_policy,
+         jint ua_override_option,
+         jstring extra_headers,
+         jbyteArray post_data,
+         jstring base_url_for_data_url,
+         jstring virtual_url_for_data_url,
+         jboolean can_load_local_resources,
+         jboolean is_renderer_initiated);
+  void ClearSslPreferences(JNIEnv* env, jobject /* obj */);
+  bool GetUseDesktopUserAgent(JNIEnv* env, jobject /* obj */);
+  void SetUseDesktopUserAgent(
+        JNIEnv* env,
+        jobject /* obj */,
+        jboolean state,
+        jboolean reload_on_state_change);
+  int GetNavigationHistory(JNIEnv* env, jobject obj, jobject history);
+  void GetDirectedNavigationHistory(
+        JNIEnv* env,
+        jobject obj,
+        jobject history,
+        jboolean is_forward,
+        jint max_entries);
+  base::android::ScopedJavaLocalRef<jstring>
+        GetOriginalUrlForActiveNavigationEntry(JNIEnv* env, jobject obj);
+  void ClearHistory(JNIEnv* env, jobject obj);
 
  private:
   NavigationController* navigation_controller_;