Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Side by Side Diff: base/android/base_jni_registrar.cc

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/animation_frame_time_histogram.h"
7 #include "base/android/application_status_listener.h" 8 #include "base/android/application_status_listener.h"
8 #include "base/android/build_info.h" 9 #include "base/android/build_info.h"
9 #include "base/android/command_line_android.h" 10 #include "base/android/command_line_android.h"
10 #include "base/android/content_uri_utils.h" 11 #include "base/android/content_uri_utils.h"
11 #include "base/android/cpu_features.h" 12 #include "base/android/cpu_features.h"
12 #include "base/android/event_log.h" 13 #include "base/android/event_log.h"
13 #include "base/android/field_trial_list.h" 14 #include "base/android/field_trial_list.h"
14 #include "base/android/important_file_writer_android.h" 15 #include "base/android/important_file_writer_android.h"
15 #include "base/android/java_handler_thread.h" 16 #include "base/android/java_handler_thread.h"
16 #include "base/android/jni_android.h" 17 #include "base/android/jni_android.h"
17 #include "base/android/jni_registrar.h" 18 #include "base/android/jni_registrar.h"
18 #include "base/android/jni_utils.h" 19 #include "base/android/jni_utils.h"
19 #include "base/android/locale_utils.h" 20 #include "base/android/locale_utils.h"
20 #include "base/android/memory_pressure_listener_android.h" 21 #include "base/android/memory_pressure_listener_android.h"
21 #include "base/android/path_service_android.h" 22 #include "base/android/path_service_android.h"
22 #include "base/android/path_utils.h" 23 #include "base/android/path_utils.h"
23 #include "base/android/record_histogram.h" 24 #include "base/android/record_histogram.h"
24 #include "base/android/sys_utils.h" 25 #include "base/android/sys_utils.h"
25 #include "base/android/thread_utils.h" 26 #include "base/android/thread_utils.h"
26 #include "base/android/trace_event_binding.h" 27 #include "base/android/trace_event_binding.h"
27 #include "base/basictypes.h" 28 #include "base/basictypes.h"
28 #include "base/message_loop/message_pump_android.h" 29 #include "base/message_loop/message_pump_android.h"
29 #include "base/power_monitor/power_monitor_device_source_android.h" 30 #include "base/power_monitor/power_monitor_device_source_android.h"
30 #include "base/trace_event/trace_event.h" 31 #include "base/trace_event/trace_event.h"
31 32
32 namespace base { 33 namespace base {
33 namespace android { 34 namespace android {
34 35
35 static RegistrationMethod kBaseRegisteredMethods[] = { 36 static RegistrationMethod kBaseRegisteredMethods[] = {
37 {"AnimationFrameTimeHistogram",
38 base::android::RegisterAnimationFrameTimeHistogram},
36 {"ApplicationStatusListener", 39 {"ApplicationStatusListener",
37 base::android::ApplicationStatusListener::RegisterBindings}, 40 base::android::ApplicationStatusListener::RegisterBindings},
38 {"BuildInfo", base::android::BuildInfo::RegisterBindings}, 41 {"BuildInfo", base::android::BuildInfo::RegisterBindings},
39 {"CommandLine", base::android::RegisterCommandLine}, 42 {"CommandLine", base::android::RegisterCommandLine},
40 {"ContentUriUtils", base::RegisterContentUriUtils}, 43 {"ContentUriUtils", base::RegisterContentUriUtils},
41 {"CpuFeatures", base::android::RegisterCpuFeatures}, 44 {"CpuFeatures", base::android::RegisterCpuFeatures},
42 {"EventLog", base::android::RegisterEventLog}, 45 {"EventLog", base::android::RegisterEventLog},
43 {"FieldTrialList", base::android::RegisterFieldTrialList}, 46 {"FieldTrialList", base::android::RegisterFieldTrialList},
44 {"ImportantFileWriterAndroid", 47 {"ImportantFileWriterAndroid",
45 base::android::RegisterImportantFileWriterAndroid}, 48 base::android::RegisterImportantFileWriterAndroid},
(...skipping 13 matching lines...) Expand all
59 }; 62 };
60 63
61 bool RegisterJni(JNIEnv* env) { 64 bool RegisterJni(JNIEnv* env) {
62 TRACE_EVENT0("startup", "base_android::RegisterJni"); 65 TRACE_EVENT0("startup", "base_android::RegisterJni");
63 return RegisterNativeMethods(env, kBaseRegisteredMethods, 66 return RegisterNativeMethods(env, kBaseRegisteredMethods,
64 arraysize(kBaseRegisteredMethods)); 67 arraysize(kBaseRegisteredMethods));
65 } 68 }
66 69
67 } // namespace android 70 } // namespace android
68 } // namespace base 71 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698