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