Consolidate ContentViewCore::Load* functions

content/public/browser/android/content_view_core.h

Index: content/public/browser/android/content_view_core.h
diff --git a/content/public/browser/android/content_view_core.h b/content/public/browser/android/content_view_core.h
index a1871963e26520c193f0b729e39d629fe475473f..46a7d21561fc597a6ce210e2059d489deb3d6a1d 100644
--- a/content/public/browser/android/content_view_core.h
+++ b/content/public/browser/android/content_view_core.h
@@ -35,6 +35,26 @@ class ContentViewCore {
                                  WebContents* web_contents);
   static ContentViewCore* GetNativeContentViewCore(JNIEnv* env, jobject obj);
 
+  // --------------------------------------------------------------------------
+  // Methods called from Java via JNI

[joth, 2012/08/09 00:33:55]

these don't need to be in the base class. They are implementation detail, and
can remain non-virtual (and private?) in the impl class.

[boliu, 2012/08/09 01:22:00]

Generated ContentViewCore_jni.h uses this through ContentViewCore, but
apparently that can be changed by renaming the definition of the native method
in Java. This file is no longer modified in this CL.

+  // --------------------------------------------------------------------------
+
+  virtual void LoadUrl(
+      JNIEnv* env, jobject obj,
+      jstring url,
+      jint load_url_type,
+      jint transition_type,
+      jint ua_override_option,
+      jbyteArray post_data,
+      jstring base_url_for_data_url,
+      jstring virtual_url_for_data_url) = 0;
+
+  // --------------------------------------------------------------------------
+  // Methods called from native code

[joth, 2012/08/09 00:33:55]

this comment shouldn't be needed, as this base class interface is only for
native code.

+  // --------------------------------------------------------------------------
+
+  virtual void LoadUrl(NavigationController::LoadURLParams& params) = 0;

[joth, 2012/08/09 00:33:55]

(does LoadUrl actually get called from native? I think it's only needed on java
side.)

+
  protected:
   virtual ~ContentViewCore() {};
 };