| 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.h" | 12 #include "content/browser/android/app_web_message_port.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/content_feature_list.h" | 15 #include "content/browser/android/content_feature_list.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/gpu_process_callback.h" | 21 #include "content/browser/android/gpu_process_callback.h" | 
|  | 22 #include "content/browser/android/ime_adapter_android.h" | 
| 22 #include "content/browser/android/interstitial_page_delegate_android.h" | 23 #include "content/browser/android/interstitial_page_delegate_android.h" | 
| 23 #include "content/browser/android/load_url_params.h" | 24 #include "content/browser/android/load_url_params.h" | 
| 24 #include "content/browser/android/tracing_controller_android.h" | 25 #include "content/browser/android/tracing_controller_android.h" | 
| 25 #include "content/browser/android/web_contents_observer_proxy.h" | 26 #include "content/browser/android/web_contents_observer_proxy.h" | 
| 26 #include "content/browser/child_process_launcher_helper_android.h" | 27 #include "content/browser/child_process_launcher_helper_android.h" | 
| 27 #include "content/browser/frame_host/navigation_controller_android.h" | 28 #include "content/browser/frame_host/navigation_controller_android.h" | 
| 28 #include "content/browser/frame_host/render_frame_host_android.h" | 29 #include "content/browser/frame_host/render_frame_host_android.h" | 
| 29 #include "content/browser/media/session/audio_focus_delegate_android.h" | 30 #include "content/browser/media/session/audio_focus_delegate_android.h" | 
| 30 #include "content/browser/media/session/media_session_android.h" | 31 #include "content/browser/media/session/media_session_android.h" | 
| 31 #include "content/browser/memory/memory_monitor_android.h" | 32 #include "content/browser/memory/memory_monitor_android.h" | 
| 32 #include "content/browser/renderer_host/ime_adapter_android.h" |  | 
| 33 #include "content/browser/speech/speech_recognizer_impl_android.h" | 33 #include "content/browser/speech/speech_recognizer_impl_android.h" | 
| 34 #include "content/browser/web_contents/web_contents_android.h" | 34 #include "content/browser/web_contents/web_contents_android.h" | 
| 35 #include "mojo/android/system/core_impl.h" | 35 #include "mojo/android/system/core_impl.h" | 
| 36 #include "mojo/android/system/watcher_impl.h" | 36 #include "mojo/android/system/watcher_impl.h" | 
| 37 | 37 | 
| 38 namespace { | 38 namespace { | 
| 39 base::android::RegistrationMethod kContentRegisteredMethods[] = { | 39 base::android::RegistrationMethod kContentRegisteredMethods[] = { | 
| 40     {"AppWebMessagePort", content::RegisterAppWebMessagePort}, | 40     {"AppWebMessagePort", content::RegisterAppWebMessagePort}, | 
| 41     {"AudioFocusDelegate", content::AudioFocusDelegateAndroid::Register}, | 41     {"AudioFocusDelegate", content::AudioFocusDelegateAndroid::Register}, | 
| 42     {"BrowserStartupController", content::RegisterBrowserStartupController}, | 42     {"BrowserStartupController", content::RegisterBrowserStartupController}, | 
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 78 namespace content { | 78 namespace content { | 
| 79 namespace android { | 79 namespace android { | 
| 80 | 80 | 
| 81 bool RegisterBrowserJni(JNIEnv* env) { | 81 bool RegisterBrowserJni(JNIEnv* env) { | 
| 82   return RegisterNativeMethods(env, kContentRegisteredMethods, | 82   return RegisterNativeMethods(env, kContentRegisteredMethods, | 
| 83                                arraysize(kContentRegisteredMethods)); | 83                                arraysize(kContentRegisteredMethods)); | 
| 84 } | 84 } | 
| 85 | 85 | 
| 86 }  // namespace android | 86 }  // namespace android | 
| 87 }  // namespace content | 87 }  // namespace content | 
| OLD | NEW | 
|---|