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 47ff5d1dd47f5c4c2067ebcb2ab7a4b299b64c6b..644c0d5f433d0d65dbd63eee623d819f9b0c62b0 100644 |
--- a/content/browser/android/browser_jni_registrar.cc |
+++ b/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,6 +21,7 @@ |
#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" |
@@ -47,8 +49,7 @@ namespace { |
base::android::RegistrationMethod kContentRegisteredMethods[] = { |
{"AndroidLocationApiAdapter", |
content::AndroidLocationApiAdapter::RegisterGeolocationService}, |
- {"BatteryStatusManager", |
- content::BatteryStatusManager::Register}, |
+ {"BatteryStatusManager", content::BatteryStatusManager::Register}, |
{"BrowserAccessibilityManager", |
content::RegisterBrowserAccessibilityManager}, |
{"BrowserStartupController", content::RegisterBrowserStartupController}, |
@@ -65,6 +66,8 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = { |
content::DownloadControllerAndroidImpl::RegisterDownloadController}, |
{"GamepadList", content::GamepadPlatformDataFetcherAndroid:: |
RegisterGamepadPlatformDataFetcherAndroid}, |
+ {"HandleViewResources", |
+ content::CompositedTouchHandleDrawable::RegisterHandleViewResources}, |
{"InterstitialPageDelegateAndroid", |
content::InterstitialPageDelegateAndroid:: |
RegisterInterstitialPageDelegateAndroid}, |
@@ -77,6 +80,8 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = { |
content::MotionEventAndroid::RegisterMotionEventAndroid}, |
{"NavigationControllerAndroid", |
content::NavigationControllerAndroid::Register}, |
+ {"PopupTouchHandleDrawable", |
+ content::PopupTouchHandleDrawable::RegisterPopupTouchHandleDrawable}, |
{"PowerSaveBlock", content::RegisterPowerSaveBlocker}, |
{"RegisterImeAdapter", content::RegisterImeAdapter}, |
{"ScreenOrientationProvider", |