Aura on Android: content/browser

content/browser/android/browser_jni_registrar.cc

Index: content/browser/android/browser_jni_registrar.cc
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc
index bea20650d80430b73d97b5a71ceb40e1543a48d9..2ab13b49eba4f15e64c102c29d6ed4f9e67cff37 100644
--- a/content/browser/android/browser_jni_registrar.cc
+++ b/content/browser/android/browser_jni_registrar.cc
@@ -6,12 +6,18 @@
 

[no sievers, 2015/10/22 20:55:40]

let's pull this file out of the patch and deal with it separately
(crbug.com/546713).

[mfomitchev, 2015/11/02 21:51:15]

Hmm.. content/browser/BUILD.gn needs to be in sync with this file, so wouldn't
it make sense to modify these two files together, in one CL?

If we split browser_jni_registrar.cc into Aura and non-Aura parts - any
suggestions for the naming of the two files?

 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
+#include "content/browser/android/browser_startup_controller.h"
+#include "content/browser/android/child_process_launcher_android.h"
+#include "content/browser/mojo/service_registrar_android.h"
+#include "content/browser/mojo/service_registry_android.h"
+#include "content/browser/renderer_host/input/motion_event_android.h"
+#include "mojo/android/system/core_impl.h"
+
+#if !defined(USE_AURA)
 #include "content/browser/accessibility/browser_accessibility_android.h"
 #include "content/browser/accessibility/browser_accessibility_manager_android.h"
 #include "content/browser/android/background_sync_launcher_android.h"
 #include "content/browser/android/background_sync_network_observer_android.h"
-#include "content/browser/android/browser_startup_controller.h"
-#include "content/browser/android/child_process_launcher_android.h"
 #include "content/browser/android/composited_touch_handle_drawable.h"
 #include "content/browser/android/content_readback_handler.h"
 #include "content/browser/android/content_video_view.h"
@@ -32,21 +38,24 @@
 #include "content/browser/media/android/media_drm_credential_manager.h"
 #include "content/browser/media/android/media_resource_getter_impl.h"
 #include "content/browser/media/android/media_session.h"
-#include "content/browser/mojo/service_registrar_android.h"
-#include "content/browser/mojo/service_registry_android.h"
 #include "content/browser/power_save_blocker_android.h"
 #include "content/browser/renderer_host/ime_adapter_android.h"
-#include "content/browser/renderer_host/input/motion_event_android.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h"
 #include "content/browser/screen_orientation/screen_orientation_delegate_android.h"
 #include "content/browser/speech/speech_recognizer_impl_android.h"
 #include "content/browser/time_zone_monitor_android.h"
 #include "content/browser/vr/android/cardboard/cardboard_vr_device.h"
 #include "content/browser/web_contents/web_contents_android.h"
-#include "mojo/android/system/core_impl.h"
+#endif
 
 namespace {
 base::android::RegistrationMethod kContentRegisteredMethods[] = {
+    {"BrowserStartupController", content::RegisterBrowserStartupController},
+    {"CoreImpl", mojo::android::RegisterCoreImpl},
+    {"MotionEventAndroid",
+     content::MotionEventAndroid::RegisterMotionEventAndroid},
+    {"ChildProcessLauncher", content::RegisterChildProcessLauncher},
+#if !defined(USE_AURA)
     {"AndroidLocationApiAdapter",
      content::AndroidLocationApiAdapter::RegisterGeolocationService},
     {"BackgroundSyncLauncherAndroid",
@@ -56,19 +65,16 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
          RegisterNetworkObserver},
     {"BrowserAccessibilityManager",
      content::RegisterBrowserAccessibilityManager},
-    {"BrowserStartupController", content::RegisterBrowserStartupController},
 #if defined(ENABLE_WEBVR)
     {"CardboardVRDevice",
      content::CardboardVRDevice::RegisterCardboardVRDevice},
 #endif
-    {"ChildProcessLauncher", content::RegisterChildProcessLauncher},
     {"ContentReadbackHandler",
      content::ContentReadbackHandler::RegisterContentReadbackHandler},
     {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView},
     {"ContentViewCore", content::RegisterContentViewCore},
     {"ContentViewRenderView",
      content::ContentViewRenderView::RegisterContentViewRenderView},
-    {"CoreImpl", mojo::android::RegisterCoreImpl},
     {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid},
     {"DownloadControllerAndroidImpl",
      content::DownloadControllerAndroidImpl::RegisterDownloadController},
@@ -86,8 +92,6 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
     {"MediaResourceGetterImpl",
      content::MediaResourceGetterImpl::RegisterMediaResourceGetter},
     {"MediaSession", content::MediaSession::RegisterMediaSession},
-    {"MotionEventAndroid",
-     content::MotionEventAndroid::RegisterMotionEventAndroid},
     {"MotionEventSynthesizer",
      content::SyntheticGestureTargetAndroid::RegisterMotionEventSynthesizer},
     {"NavigationControllerAndroid",
@@ -108,6 +112,7 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
     {"WebContentsAndroid", content::WebContentsAndroid::Register},
     {"WebContentsObserver", content::RegisterWebContentsObserverProxy},
     {"WebViewStatics", content::RegisterWebViewStatics},
+#endif  // USE_AURA
 };
 
 }  // namespace