| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/android/browser_jni_registrar.h" | 5 #include "content/browser/android/browser_jni_registrar.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_registrar.h" | 8 #include "base/android/jni_registrar.h" |
| 9 #include "content/browser/android/android_browser_process.h" | 9 #include "content/browser/android/android_browser_process.h" |
| 10 #include "content/browser/android/content_settings.h" | 10 #include "content/browser/android/content_settings.h" |
| 11 #include "content/browser/android/content_video_view.h" | 11 #include "content/browser/android/content_video_view.h" |
| 12 #include "content/browser/android/content_view_client.h" | 12 #include "content/browser/android/content_view_client.h" |
| 13 #include "content/browser/android/content_view_core_impl.h" | 13 #include "content/browser/android/content_view_core_impl.h" |
| 14 #include "content/browser/android/content_view_statics.h" | 14 #include "content/browser/android/content_view_statics.h" |
| 15 #include "content/browser/android/download_controller.h" | 15 #include "content/browser/android/download_controller.h" |
| 16 #include "content/browser/android/load_url_params.h" | 16 #include "content/browser/android/load_url_params.h" |
| 17 #include "content/browser/android/sandboxed_process_launcher.h" | 17 #include "content/browser/android/sandboxed_process_launcher.h" |
| 18 #include "content/browser/android/surface_texture_peer_browser_impl.h" |
| 18 #include "content/browser/android/touch_point.h" | 19 #include "content/browser/android/touch_point.h" |
| 19 #include "content/browser/android/web_contents_observer_android.h" | 20 #include "content/browser/android/web_contents_observer_android.h" |
| 20 #include "content/browser/geolocation/location_api_adapter_android.h" | 21 #include "content/browser/geolocation/location_api_adapter_android.h" |
| 21 #include "content/browser/renderer_host/ime_adapter_android.h" | 22 #include "content/browser/renderer_host/ime_adapter_android.h" |
| 22 #include "content/browser/renderer_host/java/java_bound_object.h" | 23 #include "content/browser/renderer_host/java/java_bound_object.h" |
| 23 | 24 |
| 25 using content::SurfaceTexturePeerBrowserImpl; |
| 26 |
| 24 namespace { | 27 namespace { |
| 25 base::android::RegistrationMethod kContentRegisteredMethods[] = { | 28 base::android::RegistrationMethod kContentRegisteredMethods[] = { |
| 26 { "AndroidLocationApiAdapter", | 29 { "AndroidLocationApiAdapter", |
| 27 AndroidLocationApiAdapter::RegisterGeolocationService }, | 30 AndroidLocationApiAdapter::RegisterGeolocationService }, |
| 28 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, | 31 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, |
| 32 { "BrowserProcessSurfaceTexture", |
| 33 SurfaceTexturePeerBrowserImpl::RegisterBrowserProcessSurfaceTexture }, |
| 29 { "ContentSettings", content::ContentSettings::RegisterContentSettings }, | 34 { "ContentSettings", content::ContentSettings::RegisterContentSettings }, |
| 30 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView }, | 35 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView }, |
| 31 { "ContentViewClient", content::RegisterContentViewClient }, | 36 { "ContentViewClient", content::RegisterContentViewClient }, |
| 32 { "ContentViewCore", content::RegisterContentViewCore }, | 37 { "ContentViewCore", content::RegisterContentViewCore }, |
| 33 { "DownloadController", | 38 { "DownloadController", |
| 34 content::DownloadController::RegisterDownloadController }, | 39 content::DownloadController::RegisterDownloadController }, |
| 35 { "RegisterImeAdapter", content::RegisterImeAdapter }, | 40 { "RegisterImeAdapter", content::RegisterImeAdapter }, |
| 36 { "JavaBoundObject", JavaBoundObject::RegisterJavaBoundObject }, | 41 { "JavaBoundObject", JavaBoundObject::RegisterJavaBoundObject }, |
| 37 { "LoadUrlParams", content::RegisterLoadUrlParams }, | 42 { "LoadUrlParams", content::RegisterLoadUrlParams }, |
| 38 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher }, | 43 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher }, |
| 39 { "TouchPoint", content::RegisterTouchPoint }, | 44 { "TouchPoint", content::RegisterTouchPoint }, |
| 40 { "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid }, | 45 { "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid }, |
| 41 { "WebViewStatics", content::RegisterWebViewStatics }, | 46 { "WebViewStatics", content::RegisterWebViewStatics }, |
| 42 }; | 47 }; |
| 43 | 48 |
| 44 } // namespace | 49 } // namespace |
| 45 | 50 |
| 46 namespace content { | 51 namespace content { |
| 47 namespace android { | 52 namespace android { |
| 48 | 53 |
| 49 bool RegisterBrowserJni(JNIEnv* env) { | 54 bool RegisterBrowserJni(JNIEnv* env) { |
| 50 return RegisterNativeMethods(env, kContentRegisteredMethods, | 55 return RegisterNativeMethods(env, kContentRegisteredMethods, |
| 51 arraysize(kContentRegisteredMethods)); | 56 arraysize(kContentRegisteredMethods)); |
| 52 } | 57 } |
| 53 | 58 |
| 54 } // namespace android | 59 } // namespace android |
| 55 } // namespace content | 60 } // namespace content |
| OLD | NEW |