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