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/sandboxed_process_launcher.h" | 17 #include "content/browser/android/sandboxed_process_launcher.h" |
17 #include "content/browser/android/touch_point.h" | 18 #include "content/browser/android/touch_point.h" |
18 #include "content/browser/geolocation/location_api_adapter_android.h" | 19 #include "content/browser/geolocation/location_api_adapter_android.h" |
19 #include "content/browser/renderer_host/java/java_bound_object.h" | 20 #include "content/browser/renderer_host/java/java_bound_object.h" |
20 #include "content/common/android/device_info.h" | 21 #include "content/common/android/device_info.h" |
21 | 22 |
22 namespace { | 23 namespace { |
23 base::android::RegistrationMethod kContentRegisteredMethods[] = { | 24 base::android::RegistrationMethod kContentRegisteredMethods[] = { |
24 { "AndroidLocationApiAdapter", | 25 { "AndroidLocationApiAdapter", |
25 AndroidLocationApiAdapter::RegisterGeolocationService }, | 26 AndroidLocationApiAdapter::RegisterGeolocationService }, |
26 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, | 27 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, |
27 { "ContentSettings", content::ContentSettings::RegisterContentSettings }, | 28 { "ContentSettings", content::ContentSettings::RegisterContentSettings }, |
28 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView }, | 29 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView }, |
29 { "ContentViewClient", content::RegisterContentViewClient }, | 30 { "ContentViewClient", content::RegisterContentViewClient }, |
30 { "ContentViewCore", content::RegisterContentViewCore }, | 31 { "ContentViewCore", content::RegisterContentViewCore }, |
31 { "DeviceInfo", content::RegisterDeviceInfo }, | 32 { "DeviceInfo", content::RegisterDeviceInfo }, |
32 { "DownloadController", | 33 { "DownloadController", |
33 content::DownloadController::RegisterDownloadController }, | 34 content::DownloadController::RegisterDownloadController }, |
34 { "JavaBoundObject", JavaBoundObject::RegisterJavaBoundObject }, | 35 { "JavaBoundObject", JavaBoundObject::RegisterJavaBoundObject }, |
| 36 { "LoadUrlParams", content::RegisterLoadUrlParams }, |
35 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher }, | 37 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher }, |
36 { "TouchPoint", content::RegisterTouchPoint }, | 38 { "TouchPoint", content::RegisterTouchPoint }, |
37 { "WebViewStatics", content::RegisterWebViewStatics }, | 39 { "WebViewStatics", content::RegisterWebViewStatics }, |
38 }; | 40 }; |
39 | 41 |
40 } // namespace | 42 } // namespace |
41 | 43 |
42 namespace content { | 44 namespace content { |
43 namespace android { | 45 namespace android { |
44 | 46 |
45 bool RegisterBrowserJni(JNIEnv* env) { | 47 bool RegisterBrowserJni(JNIEnv* env) { |
46 return RegisterNativeMethods(env, kContentRegisteredMethods, | 48 return RegisterNativeMethods(env, kContentRegisteredMethods, |
47 arraysize(kContentRegisteredMethods)); | 49 arraysize(kContentRegisteredMethods)); |
48 } | 50 } |
49 | 51 |
50 } // namespace android | 52 } // namespace android |
51 } // namespace content | 53 } // namespace content |
OLD | NEW |