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