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_core_impl.h" | 12 #include "content/browser/android/content_view_core_impl.h" |
13 #include "content/browser/android/content_view_render_view.h" | 13 #include "content/browser/android/content_view_render_view.h" |
14 #include "content/browser/android/content_view_statics.h" | 14 #include "content/browser/android/content_view_statics.h" |
| 15 #include "content/browser/android/date_time_chooser_android.h" |
15 #include "content/browser/android/download_controller_android_impl.h" | 16 #include "content/browser/android/download_controller_android_impl.h" |
16 #include "content/browser/android/interstitial_page_delegate_android.h" | 17 #include "content/browser/android/interstitial_page_delegate_android.h" |
17 #include "content/browser/android/load_url_params.h" | 18 #include "content/browser/android/load_url_params.h" |
18 #include "content/browser/android/sandboxed_process_launcher.h" | 19 #include "content/browser/android/sandboxed_process_launcher.h" |
19 #include "content/browser/android/surface_texture_peer_browser_impl.h" | 20 #include "content/browser/android/surface_texture_peer_browser_impl.h" |
20 #include "content/browser/android/touch_point.h" | 21 #include "content/browser/android/touch_point.h" |
21 #include "content/browser/android/tracing_intent_handler.h" | 22 #include "content/browser/android/tracing_intent_handler.h" |
22 #include "content/browser/android/web_contents_observer_android.h" | 23 #include "content/browser/android/web_contents_observer_android.h" |
23 #include "content/browser/geolocation/location_api_adapter_android.h" | 24 #include "content/browser/geolocation/location_api_adapter_android.h" |
24 #include "content/browser/renderer_host/ime_adapter_android.h" | 25 #include "content/browser/renderer_host/ime_adapter_android.h" |
25 #include "content/browser/renderer_host/java/java_bound_object.h" | 26 #include "content/browser/renderer_host/java/java_bound_object.h" |
26 | 27 |
27 using content::SurfaceTexturePeerBrowserImpl; | 28 using content::SurfaceTexturePeerBrowserImpl; |
28 | 29 |
29 namespace { | 30 namespace { |
30 base::android::RegistrationMethod kContentRegisteredMethods[] = { | 31 base::android::RegistrationMethod kContentRegisteredMethods[] = { |
31 { "AndroidLocationApiAdapter", | 32 { "AndroidLocationApiAdapter", |
32 content::AndroidLocationApiAdapter::RegisterGeolocationService }, | 33 content::AndroidLocationApiAdapter::RegisterGeolocationService }, |
33 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, | 34 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, |
34 { "BrowserProcessSurfaceTexture", | 35 { "BrowserProcessSurfaceTexture", |
35 SurfaceTexturePeerBrowserImpl::RegisterBrowserProcessSurfaceTexture }, | 36 SurfaceTexturePeerBrowserImpl::RegisterBrowserProcessSurfaceTexture }, |
36 { "ContentSettings", content::ContentSettings::RegisterContentSettings }, | 37 { "ContentSettings", content::ContentSettings::RegisterContentSettings }, |
37 { "ContentViewRenderView", | 38 { "ContentViewRenderView", |
38 content::ContentViewRenderView::RegisterContentViewRenderView }, | 39 content::ContentViewRenderView::RegisterContentViewRenderView }, |
39 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView }, | 40 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView }, |
40 { "ContentViewCore", content::RegisterContentViewCore }, | 41 { "ContentViewCore", content::RegisterContentViewCore }, |
| 42 { "DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid}, |
41 { "DownloadControllerAndroidImpl", | 43 { "DownloadControllerAndroidImpl", |
42 content::DownloadControllerAndroidImpl::RegisterDownloadController }, | 44 content::DownloadControllerAndroidImpl::RegisterDownloadController }, |
43 { "InterstitialPageDelegateAndroid", | 45 { "InterstitialPageDelegateAndroid", |
44 content::InterstitialPageDelegateAndroid | 46 content::InterstitialPageDelegateAndroid |
45 ::RegisterInterstitialPageDelegateAndroid }, | 47 ::RegisterInterstitialPageDelegateAndroid }, |
46 { "LoadUrlParams", content::RegisterLoadUrlParams }, | 48 { "LoadUrlParams", content::RegisterLoadUrlParams }, |
47 { "RegisterImeAdapter", content::RegisterImeAdapter }, | 49 { "RegisterImeAdapter", content::RegisterImeAdapter }, |
48 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher }, | 50 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher }, |
49 { "TouchPoint", content::RegisterTouchPoint }, | 51 { "TouchPoint", content::RegisterTouchPoint }, |
50 { "TracingIntentHandler", content::RegisterTracingIntentHandler }, | 52 { "TracingIntentHandler", content::RegisterTracingIntentHandler }, |
51 { "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid }, | 53 { "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid }, |
52 { "WebViewStatics", content::RegisterWebViewStatics }, | 54 { "WebViewStatics", content::RegisterWebViewStatics }, |
53 }; | 55 }; |
54 | 56 |
55 } // namespace | 57 } // namespace |
56 | 58 |
57 namespace content { | 59 namespace content { |
58 namespace android { | 60 namespace android { |
59 | 61 |
60 bool RegisterBrowserJni(JNIEnv* env) { | 62 bool RegisterBrowserJni(JNIEnv* env) { |
61 return RegisterNativeMethods(env, kContentRegisteredMethods, | 63 return RegisterNativeMethods(env, kContentRegisteredMethods, |
62 arraysize(kContentRegisteredMethods)); | 64 arraysize(kContentRegisteredMethods)); |
63 } | 65 } |
64 | 66 |
65 } // namespace android | 67 } // namespace android |
66 } // namespace content | 68 } // namespace content |
OLD | NEW |