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

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

Issue 16897005: Revert 206507 "Move message_pump to base/message_loop." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « trunk/src/ash/shell.cc ('k') | trunk/src/base/base.gyp » ('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/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/thread_utils.h" 16 #include "base/android/thread_utils.h"
17 #include "base/basictypes.h" 17 #include "base/basictypes.h"
18 #include "base/debug/trace_event.h" 18 #include "base/debug/trace_event.h"
19 #include "base/message_loop/message_pump_android.h" 19 #include "base/message_pump_android.h"
20 #include "base/power_monitor/power_monitor_android.h" 20 #include "base/power_monitor/power_monitor_android.h"
21 21
22 #if defined(GOOGLE_TV) 22 #if defined(GOOGLE_TV)
23 #include "base/android/context_types.h" 23 #include "base/android/context_types.h"
24 #endif 24 #endif
25 25
26 namespace base { 26 namespace base {
27 namespace android { 27 namespace android {
28 28
29 static RegistrationMethod kBaseRegisteredMethods[] = { 29 static RegistrationMethod kBaseRegisteredMethods[] = {
(...skipping 15 matching lines...) Expand all
45 }; 45 };
46 46
47 bool RegisterJni(JNIEnv* env) { 47 bool RegisterJni(JNIEnv* env) {
48 TRACE_EVENT0("startup", "base_android::RegisterJni"); 48 TRACE_EVENT0("startup", "base_android::RegisterJni");
49 return RegisterNativeMethods(env, kBaseRegisteredMethods, 49 return RegisterNativeMethods(env, kBaseRegisteredMethods,
50 arraysize(kBaseRegisteredMethods)); 50 arraysize(kBaseRegisteredMethods));
51 } 51 }
52 52
53 } // namespace android 53 } // namespace android
54 } // namespace base 54 } // namespace base
OLDNEW
« no previous file with comments | « trunk/src/ash/shell.cc ('k') | trunk/src/base/base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698