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/browser/android/android_browser_process.h" | 11 #include "content/browser/android/android_browser_process.h" |
12 #include "content/browser/android/command_line.h" | 12 #include "content/browser/android/command_line.h" |
13 #include "content/browser/android/device_info.h" | 13 #include "content/browser/android/device_info.h" |
14 #include "content/browser/android/download_controller.h" | 14 #include "content/browser/android/download_controller.h" |
15 #include "content/browser/android/jni_helper.h" | 15 #include "content/browser/android/jni_helper.h" |
| 16 #include "content/browser/android/sandboxed_process_launcher.h" |
16 #include "content/browser/android/trace_event_binding.h" | 17 #include "content/browser/android/trace_event_binding.h" |
17 #include "content/common/android/surface_callback.h" | 18 #include "content/common/android/surface_callback.h" |
18 | 19 |
19 namespace content { | 20 namespace content { |
20 namespace android { | 21 namespace android { |
21 | 22 |
22 base::android::RegistrationMethod kContentRegisteredMethods[] = { | 23 base::android::RegistrationMethod kContentRegisteredMethods[] = { |
23 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, | 24 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, |
24 { "CommandLine", RegisterCommandLine }, | 25 { "CommandLine", RegisterCommandLine }, |
25 { "ContentMain", content::RegisterContentMain }, | 26 { "ContentMain", content::RegisterContentMain }, |
26 { "DeviceInfo", RegisterDeviceInfo }, | 27 { "DeviceInfo", RegisterDeviceInfo }, |
27 { "DownloadController", DownloadController::RegisterDownloadController }, | 28 { "DownloadController", DownloadController::RegisterDownloadController }, |
28 { "JniHelper", RegisterJniHelper }, | 29 { "JniHelper", RegisterJniHelper }, |
| 30 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher }, |
29 { "SandboxedProcessService", content::RegisterSandboxedProcessService }, | 31 { "SandboxedProcessService", content::RegisterSandboxedProcessService }, |
30 { "SurfaceCallback", content::RegisterSurfaceCallback }, | 32 { "SurfaceCallback", content::RegisterSurfaceCallback }, |
31 { "TraceEvent", RegisterTraceEvent }, | 33 { "TraceEvent", RegisterTraceEvent }, |
32 }; | 34 }; |
33 | 35 |
34 bool RegisterJni(JNIEnv* env) { | 36 bool RegisterJni(JNIEnv* env) { |
35 return RegisterNativeMethods(env, kContentRegisteredMethods, | 37 return RegisterNativeMethods(env, kContentRegisteredMethods, |
36 arraysize(kContentRegisteredMethods)); | 38 arraysize(kContentRegisteredMethods)); |
37 } | 39 } |
38 | 40 |
39 } // namespace android | 41 } // namespace android |
40 } // namespace content | 42 } // namespace content |
OLD | NEW |