| 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/app_web_message_port_service_impl.h" | 12 #include "content/browser/android/app_web_message_port_service_impl.h" | 
| 13 #include "content/browser/android/background_sync_network_observer_android.h" | 13 #include "content/browser/android/background_sync_network_observer_android.h" | 
| 14 #include "content/browser/android/browser_startup_controller.h" | 14 #include "content/browser/android/browser_startup_controller.h" | 
| 15 #include "content/browser/android/child_process_launcher_android.h" | 15 #include "content/browser/android/child_process_launcher_android.h" | 
| 16 #include "content/browser/android/content_video_view.h" | 16 #include "content/browser/android/content_video_view.h" | 
| 17 #include "content/browser/android/content_view_core_impl.h" | 17 #include "content/browser/android/content_view_core_impl.h" | 
| 18 #include "content/browser/android/content_view_render_view.h" | 18 #include "content/browser/android/content_view_render_view.h" | 
| 19 #include "content/browser/android/content_view_statics.h" | 19 #include "content/browser/android/content_view_statics.h" | 
| 20 #include "content/browser/android/date_time_chooser_android.h" | 20 #include "content/browser/android/date_time_chooser_android.h" | 
| 21 #include "content/browser/android/interstitial_page_delegate_android.h" | 21 #include "content/browser/android/interstitial_page_delegate_android.h" | 
|  | 22 #include "content/browser/android/joystick_scroll_provider.h" | 
| 22 #include "content/browser/android/load_url_params.h" | 23 #include "content/browser/android/load_url_params.h" | 
| 23 #include "content/browser/android/tracing_controller_android.h" | 24 #include "content/browser/android/tracing_controller_android.h" | 
| 24 #include "content/browser/android/web_contents_observer_proxy.h" | 25 #include "content/browser/android/web_contents_observer_proxy.h" | 
| 25 #include "content/browser/device_sensors/sensor_manager_android.h" | 26 #include "content/browser/device_sensors/sensor_manager_android.h" | 
| 26 #include "content/browser/frame_host/navigation_controller_android.h" | 27 #include "content/browser/frame_host/navigation_controller_android.h" | 
| 27 #include "content/browser/media/session/audio_focus_delegate_android.h" | 28 #include "content/browser/media/session/audio_focus_delegate_android.h" | 
| 28 #include "content/browser/media/session/media_session_android.h" | 29 #include "content/browser/media/session/media_session_android.h" | 
| 29 #include "content/browser/memory/memory_monitor_android.h" | 30 #include "content/browser/memory/memory_monitor_android.h" | 
| 30 #include "content/browser/renderer_host/ime_adapter_android.h" | 31 #include "content/browser/renderer_host/ime_adapter_android.h" | 
| 31 #include "content/browser/speech/speech_recognizer_impl_android.h" | 32 #include "content/browser/speech/speech_recognizer_impl_android.h" | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
| 47          RegisterNetworkObserver}, | 48          RegisterNetworkObserver}, | 
| 48     {"BrowserAccessibilityManager", | 49     {"BrowserAccessibilityManager", | 
| 49      content::RegisterBrowserAccessibilityManager}, | 50      content::RegisterBrowserAccessibilityManager}, | 
| 50     {"ContentViewCore", content::RegisterContentViewCore}, | 51     {"ContentViewCore", content::RegisterContentViewCore}, | 
| 51     {"ContentViewRenderView", | 52     {"ContentViewRenderView", | 
| 52      content::ContentViewRenderView::RegisterContentViewRenderView}, | 53      content::ContentViewRenderView::RegisterContentViewRenderView}, | 
| 53     {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid}, | 54     {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid}, | 
| 54     {"InterstitialPageDelegateAndroid", | 55     {"InterstitialPageDelegateAndroid", | 
| 55      content::InterstitialPageDelegateAndroid:: | 56      content::InterstitialPageDelegateAndroid:: | 
| 56          RegisterInterstitialPageDelegateAndroid}, | 57          RegisterInterstitialPageDelegateAndroid}, | 
|  | 58     {"JoystickScrollProvider", content::RegisterJoystickScrollProvider}, | 
| 57     {"LoadUrlParams", content::RegisterLoadUrlParams}, | 59     {"LoadUrlParams", content::RegisterLoadUrlParams}, | 
| 58     {"MediaSessionImpl", content::MediaSessionAndroid::Register}, | 60     {"MediaSessionImpl", content::MediaSessionAndroid::Register}, | 
| 59     {"NavigationControllerAndroid", | 61     {"NavigationControllerAndroid", | 
| 60      content::NavigationControllerAndroid::Register}, | 62      content::NavigationControllerAndroid::Register}, | 
| 61     {"RegisterImeAdapter", content::RegisterImeAdapter}, | 63     {"RegisterImeAdapter", content::RegisterImeAdapter}, | 
| 62     {"SensorManagerAndroid", content::SensorManagerAndroid::Register}, | 64     {"SensorManagerAndroid", content::SensorManagerAndroid::Register}, | 
| 63     {"SpeechRecognizerImplAndroid", | 65     {"SpeechRecognizerImplAndroid", | 
| 64      content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer}, | 66      content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer}, | 
| 65     {"TracingControllerAndroid", content::RegisterTracingControllerAndroid}, | 67     {"TracingControllerAndroid", content::RegisterTracingControllerAndroid}, | 
| 66     {"WatcherImpl", mojo::android::RegisterWatcherImpl}, | 68     {"WatcherImpl", mojo::android::RegisterWatcherImpl}, | 
| 67     {"WebContentsAndroid", content::WebContentsAndroid::Register}, | 69     {"WebContentsAndroid", content::WebContentsAndroid::Register}, | 
| 68     {"WebContentsObserver", content::RegisterWebContentsObserverProxy}, | 70     {"WebContentsObserver", content::RegisterWebContentsObserverProxy}, | 
| 69     {"WebViewStatics", content::RegisterWebViewStatics}, | 71     {"WebViewStatics", content::RegisterWebViewStatics}, | 
| 70 }; | 72 }; | 
| 71 | 73 | 
| 72 }  // namespace | 74 }  // namespace | 
| 73 | 75 | 
| 74 namespace content { | 76 namespace content { | 
| 75 namespace android { | 77 namespace android { | 
| 76 | 78 | 
| 77 bool RegisterBrowserJni(JNIEnv* env) { | 79 bool RegisterBrowserJni(JNIEnv* env) { | 
| 78   return RegisterNativeMethods(env, kContentRegisteredMethods, | 80   return RegisterNativeMethods(env, kContentRegisteredMethods, | 
| 79                                arraysize(kContentRegisteredMethods)); | 81                                arraysize(kContentRegisteredMethods)); | 
| 80 } | 82 } | 
| 81 | 83 | 
| 82 }  // namespace android | 84 }  // namespace android | 
| 83 }  // namespace content | 85 }  // namespace content | 
| OLD | NEW | 
|---|