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

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

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 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
« no previous file with comments | « base/android/application_status_listener.cc ('k') | base/android/build_info.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/animation_frame_time_histogram.h"
8 #include "base/android/apk_assets.h"
8 #include "base/android/application_status_listener.h" 9 #include "base/android/application_status_listener.h"
9 #include "base/android/build_info.h" 10 #include "base/android/build_info.h"
10 #include "base/android/command_line_android.h" 11 #include "base/android/command_line_android.h"
11 #include "base/android/content_uri_utils.h" 12 #include "base/android/content_uri_utils.h"
12 #include "base/android/cpu_features.h" 13 #include "base/android/cpu_features.h"
13 #include "base/android/event_log.h" 14 #include "base/android/event_log.h"
14 #include "base/android/field_trial_list.h" 15 #include "base/android/field_trial_list.h"
15 #include "base/android/important_file_writer_android.h" 16 #include "base/android/important_file_writer_android.h"
16 #include "base/android/java_handler_thread.h" 17 #include "base/android/java_handler_thread.h"
17 #include "base/android/java_runtime.h" 18 #include "base/android/java_runtime.h"
(...skipping 13 matching lines...) Expand all
31 #include "base/message_loop/message_pump_android.h" 32 #include "base/message_loop/message_pump_android.h"
32 #include "base/power_monitor/power_monitor_device_source_android.h" 33 #include "base/power_monitor/power_monitor_device_source_android.h"
33 #include "base/trace_event/trace_event.h" 34 #include "base/trace_event/trace_event.h"
34 35
35 namespace base { 36 namespace base {
36 namespace android { 37 namespace android {
37 38
38 static RegistrationMethod kBaseRegisteredMethods[] = { 39 static RegistrationMethod kBaseRegisteredMethods[] = {
39 {"AnimationFrameTimeHistogram", 40 {"AnimationFrameTimeHistogram",
40 base::android::RegisterAnimationFrameTimeHistogram}, 41 base::android::RegisterAnimationFrameTimeHistogram},
42 {"ApkAssets",
43 base::android::RegisterApkAssets},
41 {"ApplicationStatusListener", 44 {"ApplicationStatusListener",
42 base::android::ApplicationStatusListener::RegisterBindings}, 45 base::android::ApplicationStatusListener::RegisterBindings},
43 {"BuildInfo", base::android::BuildInfo::RegisterBindings}, 46 {"BuildInfo", base::android::BuildInfo::RegisterBindings},
44 {"CommandLine", base::android::RegisterCommandLine}, 47 {"CommandLine", base::android::RegisterCommandLine},
45 {"ContentUriUtils", base::RegisterContentUriUtils}, 48 {"ContentUriUtils", base::RegisterContentUriUtils},
46 {"CpuFeatures", base::android::RegisterCpuFeatures}, 49 {"CpuFeatures", base::android::RegisterCpuFeatures},
47 {"EventLog", base::android::RegisterEventLog}, 50 {"EventLog", base::android::RegisterEventLog},
48 {"FieldTrialList", base::android::RegisterFieldTrialList}, 51 {"FieldTrialList", base::android::RegisterFieldTrialList},
49 {"ImportantFileWriterAndroid", 52 {"ImportantFileWriterAndroid",
50 base::android::RegisterImportantFileWriterAndroid}, 53 base::android::RegisterImportantFileWriterAndroid},
(...skipping 15 matching lines...) Expand all
66 }; 69 };
67 70
68 bool RegisterJni(JNIEnv* env) { 71 bool RegisterJni(JNIEnv* env) {
69 TRACE_EVENT0("startup", "base_android::RegisterJni"); 72 TRACE_EVENT0("startup", "base_android::RegisterJni");
70 return RegisterNativeMethods(env, kBaseRegisteredMethods, 73 return RegisterNativeMethods(env, kBaseRegisteredMethods,
71 arraysize(kBaseRegisteredMethods)); 74 arraysize(kBaseRegisteredMethods));
72 } 75 }
73 76
74 } // namespace android 77 } // namespace android
75 } // namespace base 78 } // namespace base
OLDNEW
« no previous file with comments | « base/android/application_status_listener.cc ('k') | base/android/build_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698