Non-functional cleanup in ContentViewCore

content/browser/android/content_view_core_impl.cc

 // Copyright (c) 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.
 
 #include "content/browser/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 102 matching lines @@
   RenderWidgetHostView* rwhv = NULL;
   if (web_contents_)
     rwhv = web_contents_->GetRenderWidgetHostView();
   return static_cast<RenderWidgetHostViewAndroid*>(rwhv);
 }
 
 // ----------------------------------------------------------------------------
 // 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,
                                                         int page_transition) {
   GURL url(base::android::ConvertJavaStringToUTF8(env, jurl));
 
   LoadUrl(url, page_transition);
 }
 
 void ContentViewCoreImpl::LoadUrlWithoutUrlSanitizationWithUserAgentOverride(
@@ skipping 353 matching lines @@
 void ContentViewCoreImpl::StartContentIntent(const GURL& content_url) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jcontent_url =
       ConvertUTF8ToJavaString(env, content_url.spec());
   Java_ContentViewCore_startContentIntent(env,
                                           java_object_->View(env).obj(),
                                           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
 // --------------------------------------------------------------------------
 
 gfx::Rect ContentViewCoreImpl::GetBounds() const {
   NOTIMPLEMENTED() << "not upstreamed yet";
   return gfx::Rect();
 }
 
 // ----------------------------------------------------------------------------
 
 bool RegisterContentViewCore(JNIEnv* env) {
   if (!base::android::HasClass(env, kContentViewCoreClassPath)) {
     DLOG(ERROR) << "Unable to find class ContentViewCore!";
     return false;
   }
   ScopedJavaLocalRef<jclass> clazz = GetClass(env, kContentViewCoreClassPath);
   if (!HasField(env, clazz, "mNativeContentViewCore", "I")) {
     DLOG(ERROR) << "Unable to find ContentView.mNativeContentViewCore!";
     return false;
   }
   g_native_content_view = GetFieldID(env, clazz, "mNativeContentViewCore", "I");
 
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace content