| 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 "base/android/base_jni_registrar.h" | 5 #include "base/android/base_jni_registrar.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/message_pump_android.h" |
| 8 #include "base/android/build_info.h" | 9 #include "base/android/build_info.h" |
| 9 #include "base/android/locale_utils.h" | |
| 10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
| 11 #include "base/android/jni_registrar.h" | 11 #include "base/android/jni_registrar.h" |
| 12 #include "base/android/locale_utils.h" |
| 12 #include "base/android/path_utils.h" | 13 #include "base/android/path_utils.h" |
| 13 | 14 |
| 14 namespace base { | 15 namespace base { |
| 15 bool RegisterSystemMessageHandler(JNIEnv* env); | |
| 16 } | |
| 17 | |
| 18 namespace base { | |
| 19 namespace android { | 16 namespace android { |
| 20 | 17 |
| 21 static RegistrationMethod kBaseRegisteredMethods[] = { | 18 static RegistrationMethod kBaseRegisteredMethods[] = { |
| 22 { "BuildInfo", base::android::RegisterBuildInfo }, | 19 { "BuildInfo", base::android::BuildInfo::RegisterBindings }, |
| 23 { "LocaleUtils", base::android::RegisterLocaleUtils }, | 20 { "LocaleUtils", base::android::RegisterLocaleUtils }, |
| 24 { "PathUtils", base::android::RegisterPathUtils }, | 21 { "PathUtils", base::android::RegisterPathUtils }, |
| 25 { "SystemMessageHandler", base::RegisterSystemMessageHandler }, | 22 { "SystemMessageHandler", base::MessagePumpForUI::RegisterBindings }, |
| 26 }; | 23 }; |
| 27 | 24 |
| 28 bool RegisterJni(JNIEnv* env) { | 25 bool RegisterJni(JNIEnv* env) { |
| 29 return RegisterNativeMethods(env, kBaseRegisteredMethods, | 26 return RegisterNativeMethods(env, kBaseRegisteredMethods, |
| 30 arraysize(kBaseRegisteredMethods)); | 27 arraysize(kBaseRegisteredMethods)); |
| 31 } | 28 } |
| 32 | 29 |
| 33 } // namespace android | 30 } // namespace android |
| 34 } // namespace base | 31 } // namespace base |
| OLD | NEW |