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