| 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/android/activity_status.h" | 7 #include "base/android/activity_status.h" | 
| 8 #include "base/android/build_info.h" | 8 #include "base/android/build_info.h" | 
| 9 #include "base/android/cpu_features.h" | 9 #include "base/android/cpu_features.h" | 
| 10 #include "base/android/important_file_writer_android.h" | 10 #include "base/android/important_file_writer_android.h" | 
| 11 #include "base/android/jni_android.h" | 11 #include "base/android/jni_android.h" | 
| 12 #include "base/android/jni_registrar.h" | 12 #include "base/android/jni_registrar.h" | 
| 13 #include "base/android/memory_pressure_listener_android.h" | 13 #include "base/android/memory_pressure_listener_android.h" | 
| 14 #include "base/android/path_service_android.h" | 14 #include "base/android/path_service_android.h" | 
| 15 #include "base/android/path_utils.h" | 15 #include "base/android/path_utils.h" | 
|  | 16 #include "base/android/sys_utils.h" | 
| 16 #include "base/android/thread_utils.h" | 17 #include "base/android/thread_utils.h" | 
| 17 #include "base/basictypes.h" | 18 #include "base/basictypes.h" | 
| 18 #include "base/debug/trace_event.h" | 19 #include "base/debug/trace_event.h" | 
| 19 #include "base/message_pump_android.h" | 20 #include "base/message_pump_android.h" | 
| 20 #include "base/power_monitor/power_monitor_android.h" | 21 #include "base/power_monitor/power_monitor_android.h" | 
| 21 | 22 | 
| 22 #if defined(GOOGLE_TV) | 23 #if defined(GOOGLE_TV) | 
| 23 #include "base/android/context_types.h" | 24 #include "base/android/context_types.h" | 
| 24 #endif | 25 #endif | 
| 25 | 26 | 
| 26 namespace base { | 27 namespace base { | 
| 27 namespace android { | 28 namespace android { | 
| 28 | 29 | 
| 29 static RegistrationMethod kBaseRegisteredMethods[] = { | 30 static RegistrationMethod kBaseRegisteredMethods[] = { | 
| 30   { "ActivityStatus", base::android::ActivityStatus::RegisterBindings }, | 31   { "ActivityStatus", base::android::ActivityStatus::RegisterBindings }, | 
| 31   { "BuildInfo", base::android::BuildInfo::RegisterBindings }, | 32   { "BuildInfo", base::android::BuildInfo::RegisterBindings }, | 
| 32 #if defined(GOOGLE_TV) | 33 #if defined(GOOGLE_TV) | 
| 33   { "ContextTypes", base::android::RegisterContextTypes }, | 34   { "ContextTypes", base::android::RegisterContextTypes }, | 
| 34 #endif | 35 #endif | 
| 35   { "CpuFeatures", base::android::RegisterCpuFeatures }, | 36   { "CpuFeatures", base::android::RegisterCpuFeatures }, | 
| 36   { "ImportantFileWriterAndroid", | 37   { "ImportantFileWriterAndroid", | 
| 37     base::android::RegisterImportantFileWriterAndroid }, | 38     base::android::RegisterImportantFileWriterAndroid }, | 
| 38   { "MemoryPressureListenerAndroid", | 39   { "MemoryPressureListenerAndroid", | 
| 39       base::android::MemoryPressureListenerAndroid::Register }, | 40       base::android::MemoryPressureListenerAndroid::Register }, | 
| 40   { "PathService", base::android::RegisterPathService }, | 41   { "PathService", base::android::RegisterPathService }, | 
| 41   { "PathUtils", base::android::RegisterPathUtils }, | 42   { "PathUtils", base::android::RegisterPathUtils }, | 
| 42   { "SystemMessageHandler", base::MessagePumpForUI::RegisterBindings }, | 43   { "SystemMessageHandler", base::MessagePumpForUI::RegisterBindings }, | 
|  | 44   { "SysUtils", base::android::SysUtils::Register }, | 
| 43   { "PowerMonitor", base::RegisterPowerMonitor }, | 45   { "PowerMonitor", base::RegisterPowerMonitor }, | 
| 44   { "ThreadUtils", base::RegisterThreadUtils }, | 46   { "ThreadUtils", base::RegisterThreadUtils }, | 
| 45 }; | 47 }; | 
| 46 | 48 | 
| 47 bool RegisterJni(JNIEnv* env) { | 49 bool RegisterJni(JNIEnv* env) { | 
| 48   TRACE_EVENT0("startup", "base_android::RegisterJni"); | 50   TRACE_EVENT0("startup", "base_android::RegisterJni"); | 
| 49   return RegisterNativeMethods(env, kBaseRegisteredMethods, | 51   return RegisterNativeMethods(env, kBaseRegisteredMethods, | 
| 50                                arraysize(kBaseRegisteredMethods)); | 52                                arraysize(kBaseRegisteredMethods)); | 
| 51 } | 53 } | 
| 52 | 54 | 
| 53 }  // namespace android | 55 }  // namespace android | 
| 54 }  // namespace base | 56 }  // namespace base | 
| OLD | NEW | 
|---|