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 "base/macros.h" | 9 #include "base/macros.h" |
10 #include "content/browser/accessibility/browser_accessibility_android.h" | 10 #include "content/browser/accessibility/browser_accessibility_android.h" |
11 #include "content/browser/accessibility/browser_accessibility_manager_android.h" | 11 #include "content/browser/accessibility/browser_accessibility_manager_android.h" |
12 #include "content/browser/android/background_sync_network_observer_android.h" | 12 #include "content/browser/android/background_sync_network_observer_android.h" |
13 #include "content/browser/android/browser_startup_controller.h" | 13 #include "content/browser/android/browser_startup_controller.h" |
14 #include "content/browser/android/child_process_launcher_android.h" | 14 #include "content/browser/android/child_process_launcher_android.h" |
15 #include "content/browser/android/content_video_view.h" | 15 #include "content/browser/android/content_video_view.h" |
16 #include "content/browser/android/content_view_core_impl.h" | 16 #include "content/browser/android/content_view_core_impl.h" |
17 #include "content/browser/android/content_view_render_view.h" | 17 #include "content/browser/android/content_view_render_view.h" |
18 #include "content/browser/android/content_view_statics.h" | 18 #include "content/browser/android/content_view_statics.h" |
19 #include "content/browser/android/date_time_chooser_android.h" | 19 #include "content/browser/android/date_time_chooser_android.h" |
20 #include "content/browser/android/interface_provider_android_impl.h" | 20 #include "content/browser/android/interface_provider_android_impl.h" |
21 #include "content/browser/android/interface_registry_android_impl.h" | 21 #include "content/browser/android/interface_registry_android_impl.h" |
22 #include "content/browser/android/interstitial_page_delegate_android.h" | 22 #include "content/browser/android/interstitial_page_delegate_android.h" |
23 #include "content/browser/android/load_url_params.h" | 23 #include "content/browser/android/load_url_params.h" |
24 #include "content/browser/android/tracing_controller_android.h" | 24 #include "content/browser/android/tracing_controller_android.h" |
25 #include "content/browser/android/web_contents_observer_proxy.h" | 25 #include "content/browser/android/web_contents_observer_proxy.h" |
26 #include "content/browser/device_sensors/sensor_manager_android.h" | 26 #include "content/browser/device_sensors/sensor_manager_android.h" |
27 #include "content/browser/frame_host/navigation_controller_android.h" | 27 #include "content/browser/frame_host/navigation_controller_android.h" |
| 28 #include "content/browser/media/android/dialog_surface_activity_mapper.h" |
28 #include "content/browser/media/session/media_session_delegate_android.h" | 29 #include "content/browser/media/session/media_session_delegate_android.h" |
29 #include "content/browser/renderer_host/ime_adapter_android.h" | 30 #include "content/browser/renderer_host/ime_adapter_android.h" |
30 #include "content/browser/speech/speech_recognizer_impl_android.h" | 31 #include "content/browser/speech/speech_recognizer_impl_android.h" |
31 #include "content/browser/time_zone_monitor_android.h" | 32 #include "content/browser/time_zone_monitor_android.h" |
32 #include "content/browser/web_contents/web_contents_android.h" | 33 #include "content/browser/web_contents/web_contents_android.h" |
33 #include "mojo/android/system/core_impl.h" | 34 #include "mojo/android/system/core_impl.h" |
34 | 35 |
35 namespace { | 36 namespace { |
36 base::android::RegistrationMethod kContentRegisteredMethods[] = { | 37 base::android::RegistrationMethod kContentRegisteredMethods[] = { |
37 {"BrowserStartupController", content::RegisterBrowserStartupController}, | 38 {"BrowserStartupController", content::RegisterBrowserStartupController}, |
38 {"ChildProcessLauncher", content::RegisterChildProcessLauncher}, | 39 {"ChildProcessLauncher", content::RegisterChildProcessLauncher}, |
39 {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView}, | 40 {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView}, |
40 {"CoreImpl", mojo::android::RegisterCoreImpl}, | 41 {"CoreImpl", mojo::android::RegisterCoreImpl}, |
41 {"MediaSessionDelegate", content::MediaSessionDelegateAndroid::Register}, | 42 {"MediaSessionDelegate", content::MediaSessionDelegateAndroid::Register}, |
42 {"BackgroundSyncNetworkObserverAndroid", | 43 {"BackgroundSyncNetworkObserverAndroid", |
43 content::BackgroundSyncNetworkObserverAndroid::Observer:: | 44 content::BackgroundSyncNetworkObserverAndroid::Observer:: |
44 RegisterNetworkObserver}, | 45 RegisterNetworkObserver}, |
45 {"BrowserAccessibilityManager", | 46 {"BrowserAccessibilityManager", |
46 content::RegisterBrowserAccessibilityManager}, | 47 content::RegisterBrowserAccessibilityManager}, |
47 {"ContentViewCore", content::RegisterContentViewCore}, | 48 {"ContentViewCore", content::RegisterContentViewCore}, |
48 {"ContentViewRenderView", | 49 {"ContentViewRenderView", |
49 content::ContentViewRenderView::RegisterContentViewRenderView}, | 50 content::ContentViewRenderView::RegisterContentViewRenderView}, |
50 {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid}, | 51 {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid}, |
| 52 {"DialogSurfaceActivityMapper", |
| 53 content::RegisterDialogSurfaceActivityMapper}, |
51 {"InterfaceRegistryAndroid", | 54 {"InterfaceRegistryAndroid", |
52 content::InterfaceRegistryAndroidImpl::Register}, | 55 content::InterfaceRegistryAndroidImpl::Register}, |
53 {"InterfaceProviderAndroid", | 56 {"InterfaceProviderAndroid", |
54 content::InterfaceProviderAndroidImpl::Register}, | 57 content::InterfaceProviderAndroidImpl::Register}, |
55 {"InterstitialPageDelegateAndroid", | 58 {"InterstitialPageDelegateAndroid", |
56 content::InterstitialPageDelegateAndroid:: | 59 content::InterstitialPageDelegateAndroid:: |
57 RegisterInterstitialPageDelegateAndroid}, | 60 RegisterInterstitialPageDelegateAndroid}, |
58 {"LoadUrlParams", content::RegisterLoadUrlParams}, | 61 {"LoadUrlParams", content::RegisterLoadUrlParams}, |
59 {"NavigationControllerAndroid", | 62 {"NavigationControllerAndroid", |
60 content::NavigationControllerAndroid::Register}, | 63 content::NavigationControllerAndroid::Register}, |
(...skipping 13 matching lines...) Expand all Loading... |
74 namespace content { | 77 namespace content { |
75 namespace android { | 78 namespace android { |
76 | 79 |
77 bool RegisterBrowserJni(JNIEnv* env) { | 80 bool RegisterBrowserJni(JNIEnv* env) { |
78 return RegisterNativeMethods(env, kContentRegisteredMethods, | 81 return RegisterNativeMethods(env, kContentRegisteredMethods, |
79 arraysize(kContentRegisteredMethods)); | 82 arraysize(kContentRegisteredMethods)); |
80 } | 83 } |
81 | 84 |
82 } // namespace android | 85 } // namespace android |
83 } // namespace content | 86 } // namespace content |
OLD | NEW |