| 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/app/android/content_jni_registrar.h" | 5 #include "content/app/android/content_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/app/android/content_main.h" | 9 #include "content/app/android/content_main.h" |
| 10 #include "content/app/android/sandboxed_process_service.h" | 10 #include "content/app/android/sandboxed_process_service.h" |
| 11 #include "content/app/android/user_agent.h" | 11 #include "content/app/android/user_agent.h" |
| 12 #include "content/browser/android/android_browser_process.h" | 12 #include "content/browser/android/android_browser_process.h" |
| 13 #include "content/browser/android/content_settings.h" | 13 #include "content/browser/android/content_settings.h" |
| 14 #include "content/browser/android/content_view_client.h" | 14 #include "content/browser/android/content_view_client.h" |
| 15 #include "content/browser/android/content_view_impl.h" | 15 #include "content/browser/android/content_view_impl.h" |
| 16 #include "content/browser/android/device_info.h" | 16 #include "content/browser/android/device_info.h" |
| 17 #include "content/browser/android/download_controller.h" | 17 #include "content/browser/android/download_controller.h" |
| 18 #include "content/browser/android/sandboxed_process_launcher.h" | 18 #include "content/browser/android/sandboxed_process_launcher.h" |
| 19 #include "content/browser/android/touch_point.h" | 19 #include "content/browser/android/touch_point.h" |
| 20 #include "content/common/android/command_line.h" | 20 #include "content/common/android/command_line.h" |
| 21 #include "content/common/android/surface_callback.h" | 21 #include "content/common/android/surface_callback.h" |
| 22 #include "content/common/android/surface_texture_listener.h" |
| 22 #include "content/common/android/trace_event_binding.h" | 23 #include "content/common/android/trace_event_binding.h" |
| 23 | 24 |
| 24 namespace content { | 25 namespace content { |
| 25 namespace android { | 26 namespace android { |
| 26 | 27 |
| 27 base::android::RegistrationMethod kContentRegisteredMethods[] = { | 28 base::android::RegistrationMethod kContentRegisteredMethods[] = { |
| 28 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, | 29 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, |
| 29 { "CommandLine", RegisterCommandLine }, | 30 { "CommandLine", RegisterCommandLine }, |
| 30 { "ContentSettings", ContentSettings::RegisterContentSettings }, | 31 { "ContentSettings", ContentSettings::RegisterContentSettings }, |
| 31 { "ContentView", RegisterContentView }, | 32 { "ContentView", RegisterContentView }, |
| 32 { "ContentViewClient", RegisterContentViewClient }, | 33 { "ContentViewClient", RegisterContentViewClient }, |
| 33 { "ContentMain", content::RegisterContentMain }, | 34 { "ContentMain", content::RegisterContentMain }, |
| 34 { "DeviceInfo", RegisterDeviceInfo }, | 35 { "DeviceInfo", RegisterDeviceInfo }, |
| 35 { "DownloadController", DownloadController::RegisterDownloadController }, | 36 { "DownloadController", DownloadController::RegisterDownloadController }, |
| 36 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher }, | 37 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher }, |
| 37 { "SandboxedProcessService", content::RegisterSandboxedProcessService }, | 38 { "SandboxedProcessService", content::RegisterSandboxedProcessService }, |
| 38 { "SurfaceCallback", content::RegisterSurfaceCallback }, | 39 { "SurfaceCallback", content::RegisterSurfaceCallback }, |
| 40 { "SurfaceTextureListener", |
| 41 content::SurfaceTextureListener::RegisterSurfaceTextureListener }, |
| 39 { "TouchPoint", content::RegisterTouchPoint }, | 42 { "TouchPoint", content::RegisterTouchPoint }, |
| 40 { "TraceEvent", RegisterTraceEvent }, | 43 { "TraceEvent", RegisterTraceEvent }, |
| 41 { "UserAgent", content::RegisterUserAgent }, | 44 { "UserAgent", content::RegisterUserAgent }, |
| 42 }; | 45 }; |
| 43 | 46 |
| 44 bool RegisterJni(JNIEnv* env) { | 47 bool RegisterJni(JNIEnv* env) { |
| 45 return RegisterNativeMethods(env, kContentRegisteredMethods, | 48 return RegisterNativeMethods(env, kContentRegisteredMethods, |
| 46 arraysize(kContentRegisteredMethods)); | 49 arraysize(kContentRegisteredMethods)); |
| 47 } | 50 } |
| 48 | 51 |
| 49 } // namespace android | 52 } // namespace android |
| 50 } // namespace content | 53 } // namespace content |
| OLD | NEW |