Upstream version 5.34.104.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 be30869..93463c4 100644 (file)
--- a/src/content/browser/android/browser_jni_registrar.cc
+++ b/src/content/browser/android/browser_jni_registrar.cc
@@ -20,16 +20,16 @@
 #include "content/browser/android/interstitial_page_delegate_android.h"
 #include "content/browser/android/load_url_params.h"
 #include "content/browser/android/surface_texture_peer_browser_impl.h"
-#include "content/browser/android/touch_point.h"
 #include "content/browser/android/tracing_controller_android.h"
 #include "content/browser/android/web_contents_observer_android.h"
-#include "content/browser/device_orientation/data_fetcher_impl_android.h"
+#include "content/browser/device_orientation/sensor_manager_android.h"
 #include "content/browser/frame_host/navigation_controller_android.h"
 #include "content/browser/geolocation/location_api_adapter_android.h"
 #include "content/browser/media/android/media_drm_credential_manager.h"
 #include "content/browser/media/android/media_resource_getter_impl.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/renderer_host/java/java_bound_object.h"
 #include "content/browser/speech/speech_recognizer_impl_android.h"
@@ -51,7 +51,6 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
      content::ContentViewRenderView::RegisterContentViewRenderView},
     {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView},
     {"ContentViewCore", content::RegisterContentViewCore},
-    {"DataFetcherImplAndroid", content::DataFetcherImplAndroid::Register},
     {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid},
     {"DownloadControllerAndroidImpl",
      content::DownloadControllerAndroidImpl::RegisterDownloadController},
@@ -63,15 +62,17 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
      content::MediaDrmCredentialManager::RegisterMediaDrmCredentialManager},
     {"MediaResourceGetterImpl",
      content::MediaResourceGetterImpl::RegisterMediaResourceGetter},
+    {"MotionEventAndroid",
+     content::MotionEventAndroid::RegisterMotionEventAndroid},
     {"NavigationControllerAndroid",
      content::NavigationControllerAndroid::Register},
     {"PowerSaveBlock", content::RegisterPowerSaveBlocker},
     {"RegisterImeAdapter", content::RegisterImeAdapter},
+    {"SensorManagerAndroid", content::SensorManagerAndroid::Register},
     {"SpeechRecognizerImplAndroid",
      content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer},
     {"TouchEventSynthesizer",
      content::SyntheticGestureTargetAndroid::RegisterTouchEventSynthesizer},
-    {"TouchPoint", content::RegisterTouchPoint},
     {"TracingControllerAndroid", content::RegisterTracingControllerAndroid},
     {"VibrationProvider", content::VibrationProviderAndroid::Register},
     {"WebContentsAndroid", content::WebContentsAndroid::Register},