Non-functional cleanup in ContentViewCore

- Remove mentions of WebView
- Remove @hide
- Remove superfluous pure virtual method from ContentViewCore
- Fix ordering of methods

Review URL: https://chromiumcodereview.appspot.com/10830066

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149165 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/android/content_view_core_impl.cc

@@ -120,6 +120,25 @@ RenderWidgetHostViewAndroid*
 // Methods called from Java via JNI
 // ----------------------------------------------------------------------------
 
+void ContentViewCoreImpl::SelectPopupMenuItems(JNIEnv* env, jobject obj,
+                                               jintArray indices) {
+  RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(
+      web_contents_->GetRenderViewHost());
+  DCHECK(rvhi);
+  if (indices == NULL) {
+    rvhi->DidCancelPopupMenu();
+    return;
+  }
+
+  int selected_count = env->GetArrayLength(indices);
+  std::vector<int> selected_indices;
+  jint* indices_ptr = env->GetIntArrayElements(indices, NULL);
+  for (int i = 0; i < selected_count; ++i)
+    selected_indices.push_back(indices_ptr[i]);
+  env->ReleaseIntArrayElements(indices, indices_ptr, JNI_ABORT);
+  rvhi->DidSelectPopupMenuItems(selected_indices);
+}
+
 void ContentViewCoreImpl::LoadUrlWithoutUrlSanitization(JNIEnv* env,
                                                         jobject,
                                                         jstring jurl,
@@ -492,29 +511,6 @@ void ContentViewCoreImpl::StartContentIntent(const GURL& content_url) {
                                           jcontent_url.obj());
 }
 
-// --------------------------------------------------------------------------
-// Methods called from Java via JNI
-// --------------------------------------------------------------------------
-
-void ContentViewCoreImpl::SelectPopupMenuItems(JNIEnv* env, jobject obj,
-                                               jintArray indices) {
-  RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(
-      web_contents_->GetRenderViewHost());
-  DCHECK(rvhi);
-  if (indices == NULL) {
-    rvhi->DidCancelPopupMenu();
-    return;
-  }
-
-  int selected_count = env->GetArrayLength(indices);
-  std::vector<int> selected_indices;
-  jint* indices_ptr = env->GetIntArrayElements(indices, NULL);
-  for (int i = 0; i < selected_count; ++i)
-    selected_indices.push_back(indices_ptr[i]);
-  env->ReleaseIntArrayElements(indices, indices_ptr, JNI_ABORT);
-  rvhi->DidSelectPopupMenuItems(selected_indices);
-}
-
 // --------------------------------------------------------------------------
 // Methods called from native code
 // --------------------------------------------------------------------------

content/browser/android/content_view_core_impl.h

@@ -150,7 +150,7 @@ class ContentViewCoreImpl : public ContentViewCore,
   void OnAcceleratedCompositingStateChange(RenderWidgetHostViewAndroid* rwhva,
                                            bool activated,
                                            bool force);
-  virtual void StartContentIntent(const GURL& content_url) OVERRIDE;
+  void StartContentIntent(const GURL& content_url);
 
   // --------------------------------------------------------------------------
   // Methods called from native code

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

@@ -54,9 +54,9 @@ public class ContentViewCore implements MotionEventDelegate {
     // Used for Chrome.
     public static final int PERSONALITY_CHROME = 1;
 
-    // Used to avoid enabling zooming in / out in WebView zoom controls
-    // if resulting zooming will produce little visible difference.
-    private static float WEBVIEW_ZOOM_CONTROLS_EPSILON = 0.007f;
+    // Used to avoid enabling zooming in / out if resulting zooming will
+    // produce little visible difference.
+    private static float ZOOM_CONTROLS_EPSILON = 0.007f;
 
     // To avoid checkerboard, we clamp the fling velocity based on the maximum number of tiles
     // should be allowed to upload per 100ms.
@@ -180,7 +180,6 @@ public class ContentViewCore implements MotionEventDelegate {
      * @param context Context used to obtain the application context.
      * @param maxRendererProcesses Same as ContentView.enableMultiProcess()
      * @return Whether the process actually needed to be initialized (false if already running).
-     * @hide Only used by the platform browser.
      */
     public static boolean initChromiumBrowserProcess(Context context, int maxRendererProcesses) {
         return AndroidBrowserProcess.initChromiumBrowserProcess(context, maxRendererProcesses);
@@ -265,9 +264,10 @@ public class ContentViewCore implements MotionEventDelegate {
     }
 
     /**
-     * Destroy the internal state of the WebView. This method may only be called
-     * after the WebView has been removed from the view system. No other methods
-     * may be called on this WebView after this method has been called.
+     * Destroy the internal state of the ContentView. This method may only be
+     * called after the ContentView has been removed from the view system. No
+     * other methods may be called on this ContentView after this method has
+     * been called.
      */
     public void destroy() {
         hidePopupDialog();
@@ -465,8 +465,8 @@ public class ContentViewCore implements MotionEventDelegate {
     }
 
     /**
-     * Clears the WebView's page history in both the backwards and forwards
-     * directions.
+     * Clears the ContentViewCore's page history in both the backwards and
+     * forwards directions.
      */
     public void clearHistory() {
         if (mNativeContentViewCore != 0) nativeClearHistory(mNativeContentViewCore);
@@ -564,9 +564,7 @@ public class ContentViewCore implements MotionEventDelegate {
 
     /**
      * This method should be called when the containing activity is paused
-     *
-     * @hide
-     **/
+     */
     public void onActivityPause() {
         TraceEvent.begin();
         hidePopupDialog();
@@ -574,23 +572,21 @@ public class ContentViewCore implements MotionEventDelegate {
     }
 
     /**
-     * Called when the WebView is hidden.
-     *
-     * @hide
-     **/
+     * Called when the ContentView is hidden.
+     */
     public void onHide() {
         hidePopupDialog();
     }
 
     /**
      * Return the ContentSettings object used to control the settings for this
-     * WebView.
+     * ContentViewCore.
      *
      * Note that when ContentView is used in the PERSONALITY_CHROME role,
      * ContentSettings can only be used for retrieving settings values. For
      * modifications, ChromeNativePreferences is to be used.
-     * @return A ContentSettings object that can be used to control this WebView's
-     *         settings.
+     * @return A ContentSettings object that can be used to control this
+     *         ContentViewCore's settings.
      */
     public ContentSettings getContentSettings() {
         return mContentSettings;
@@ -759,30 +755,30 @@ public class ContentViewCore implements MotionEventDelegate {
     }
 
     /**
-     * Checks whether the WebView can be zoomed in.
+     * Checks whether the ContentViewCore can be zoomed in.
      *
-     * @return True if the WebView can be zoomed in.
+     * @return True if the ContentViewCore can be zoomed in.
      */
     // This method uses the term 'zoom' for legacy reasons, but relates
     // to what chrome calls the 'page scale factor'.
     public boolean canZoomIn() {
-        return mNativeMaximumScale - mNativePageScaleFactor > WEBVIEW_ZOOM_CONTROLS_EPSILON;
+        return mNativeMaximumScale - mNativePageScaleFactor > ZOOM_CONTROLS_EPSILON;
     }
 
     /**
-     * Checks whether the WebView can be zoomed out.
+     * Checks whether the ContentViewCore can be zoomed out.
      *
-     * @return True if the WebView can be zoomed out.
+     * @return True if the ContentViewCore can be zoomed out.
      */
     // This method uses the term 'zoom' for legacy reasons, but relates
     // to what chrome calls the 'page scale factor'.
     public boolean canZoomOut() {
-        return mNativePageScaleFactor - mNativeMinimumScale > WEBVIEW_ZOOM_CONTROLS_EPSILON;
+        return mNativePageScaleFactor - mNativeMinimumScale > ZOOM_CONTROLS_EPSILON;
     }
 
     /**
-     * Zooms in the WebView by 25% (or less if that would result in zooming in
-     * more than possible).
+     * Zooms in the ContentViewCore by 25% (or less if that would result in
+     * zooming in more than possible).
      *
      * @return True if there was a zoom change, false otherwise.
      */
@@ -810,8 +806,8 @@ public class ContentViewCore implements MotionEventDelegate {
     }
 
     /**
-     * Zooms out the WebView by 20% (or less if that would result in zooming out
-     * more than possible).
+     * Zooms out the ContentViewCore by 20% (or less if that would result in
+     * zooming out more than possible).
      *
      * @return True if there was a zoom change, false otherwise.
      */

content/public/browser/android/content_view_core.h

@@ -35,12 +35,6 @@ class ContentViewCore {
                                  WebContents* web_contents);
   static ContentViewCore* GetNativeContentViewCore(JNIEnv* env, jobject obj);
 
-  // --------------------------------------------------------------------------
-  // Public methods that call to Java via JNI
-  // --------------------------------------------------------------------------
-
-  virtual void StartContentIntent(const GURL& content_url) = 0;
-
  protected:
   virtual ~ContentViewCore() {};
 };