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