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/common/android/common_jni_registrar.h" | 5 #include "content/common/android/common_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/common/android/command_line.h" | 9 #include "content/common/android/command_line.h" |
| 10 #include "content/common/android/device_info.h" |
10 #include "content/common/android/surface_callback.h" | 11 #include "content/common/android/surface_callback.h" |
11 #include "content/common/android/surface_texture_listener.h" | 12 #include "content/common/android/surface_texture_listener.h" |
12 #include "content/common/android/trace_event_binding.h" | 13 #include "content/common/android/trace_event_binding.h" |
13 | 14 |
14 namespace { | 15 namespace { |
15 base::android::RegistrationMethod kContentRegisteredMethods[] = { | 16 base::android::RegistrationMethod kContentRegisteredMethods[] = { |
16 { "CommandLine", RegisterCommandLine }, | 17 { "CommandLine", RegisterCommandLine }, |
| 18 { "DeviceInfo", content::RegisterDeviceInfo }, |
17 { "SurfaceCallback", content::RegisterSurfaceCallback }, | 19 { "SurfaceCallback", content::RegisterSurfaceCallback }, |
18 { "SurfaceTextureListener", | 20 { "SurfaceTextureListener", |
19 content::SurfaceTextureListener::RegisterSurfaceTextureListener }, | 21 content::SurfaceTextureListener::RegisterSurfaceTextureListener }, |
20 { "TraceEvent", RegisterTraceEvent }, | 22 { "TraceEvent", RegisterTraceEvent }, |
21 }; | 23 }; |
22 | 24 |
23 } // namespace | 25 } // namespace |
24 | 26 |
25 namespace content { | 27 namespace content { |
26 namespace android { | 28 namespace android { |
27 | 29 |
28 bool RegisterCommonJni(JNIEnv* env) { | 30 bool RegisterCommonJni(JNIEnv* env) { |
29 return RegisterNativeMethods(env, kContentRegisteredMethods, | 31 return RegisterNativeMethods(env, kContentRegisteredMethods, |
30 arraysize(kContentRegisteredMethods)); | 32 arraysize(kContentRegisteredMethods)); |
31 } | 33 } |
32 | 34 |
33 } // namespace android | 35 } // namespace android |
34 } // namespace content | 36 } // namespace content |
OLD | NEW |