Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / browser / android / browser_jni_registrar.cc

diff --git a/src/content/browser/android/browser_jni_registrar.cc b/src/content/browser/android/browser_jni_registrar.cc
index 47ff5d1..16d7a88 100644 (file)
--- a/src/content/browser/android/browser_jni_registrar.cc
+++ b/src/content/browser/android/browser_jni_registrar.cc
@@ -10,6 +10,7 @@
 #include "content/browser/accessibility/browser_accessibility_manager_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_settings.h"
 #include "content/browser/android/content_video_view.h"
@@ -20,10 +21,11 @@
 #include "content/browser/android/download_controller_android_impl.h"
 #include "content/browser/android/interstitial_page_delegate_android.h"
 #include "content/browser/android/load_url_params.h"
+#include "content/browser/android/popup_touch_handle_drawable.h"
 #include "content/browser/android/surface_texture_peer_browser_impl.h"
 #include "content/browser/android/tracing_controller_android.h"
 #include "content/browser/android/web_contents_observer_android.h"
-#include "content/browser/battery_status/battery_status_manager.h"
+#include "content/browser/battery_status/battery_status_manager_android.h"
 #include "content/browser/device_sensors/sensor_manager_android.h"
 #include "content/browser/frame_host/navigation_controller_android.h"
 #include "content/browser/gamepad/gamepad_platform_data_fetcher_android.h"
@@ -34,7 +36,6 @@
 #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/renderer_host/java/java_bound_object.h"
 #include "content/browser/screen_orientation/screen_orientation_provider_android.h"
 #include "content/browser/speech/speech_recognizer_impl_android.h"
 #include "content/browser/time_zone_monitor_android.h"
@@ -47,8 +48,7 @@ namespace {
 base::android::RegistrationMethod kContentRegisteredMethods[] = {
     {"AndroidLocationApiAdapter",
      content::AndroidLocationApiAdapter::RegisterGeolocationService},
-    {"BatteryStatusManager",
-     content::BatteryStatusManager::Register},
+    {"BatteryStatusManager", content::BatteryStatusManagerAndroid::Register},
     {"BrowserAccessibilityManager",
      content::RegisterBrowserAccessibilityManager},
     {"BrowserStartupController", content::RegisterBrowserStartupController},
@@ -65,6 +65,8 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
      content::DownloadControllerAndroidImpl::RegisterDownloadController},
     {"GamepadList", content::GamepadPlatformDataFetcherAndroid::
                         RegisterGamepadPlatformDataFetcherAndroid},
+    {"HandleViewResources",
+     content::CompositedTouchHandleDrawable::RegisterHandleViewResources},
     {"InterstitialPageDelegateAndroid",
      content::InterstitialPageDelegateAndroid::
          RegisterInterstitialPageDelegateAndroid},
@@ -77,6 +79,8 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
      content::MotionEventAndroid::RegisterMotionEventAndroid},
     {"NavigationControllerAndroid",
      content::NavigationControllerAndroid::Register},
+    {"PopupTouchHandleDrawable",
+     content::PopupTouchHandleDrawable::RegisterPopupTouchHandleDrawable},
     {"PowerSaveBlock", content::RegisterPowerSaveBlocker},
     {"RegisterImeAdapter", content::RegisterImeAdapter},
     {"ScreenOrientationProvider",