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

Side by Side Diff: content/app/android/library_loader_hooks.cc

Issue 676953005: Revert of Replace Chrome IPC with Mojo IPC for querying BatteryStatus service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | « content/app/DEPS ('k') | content/browser/BUILD.gn » ('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 "content/public/app/android_library_loader_hooks.h" 5 #include "content/public/app/android_library_loader_hooks.h"
6 6
7 #include "base/android/base_jni_registrar.h" 7 #include "base/android/base_jni_registrar.h"
8 #include "base/android/command_line_android.h" 8 #include "base/android/command_line_android.h"
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_registrar.h" 10 #include "base/android/jni_registrar.h"
11 #include "base/android/jni_string.h" 11 #include "base/android/jni_string.h"
12 #include "base/base_switches.h" 12 #include "base/base_switches.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/debug/trace_event.h" 14 #include "base/debug/trace_event.h"
15 #include "base/files/file_path.h" 15 #include "base/files/file_path.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
18 #include "base/tracked_objects.h" 18 #include "base/tracked_objects.h"
19 #include "content/app/android/app_jni_registrar.h" 19 #include "content/app/android/app_jni_registrar.h"
20 #include "content/browser/android/browser_jni_registrar.h" 20 #include "content/browser/android/browser_jni_registrar.h"
21 #include "content/common/android/common_jni_registrar.h" 21 #include "content/common/android/common_jni_registrar.h"
22 #include "content/common/content_constants_internal.h" 22 #include "content/common/content_constants_internal.h"
23 #include "content/public/common/content_switches.h" 23 #include "content/public/common/content_switches.h"
24 #include "content/public/common/result_codes.h" 24 #include "content/public/common/result_codes.h"
25 #include "device/battery/android/battery_jni_registrar.h"
26 #include "media/base/android/media_jni_registrar.h" 25 #include "media/base/android/media_jni_registrar.h"
27 #include "net/android/net_jni_registrar.h" 26 #include "net/android/net_jni_registrar.h"
28 #include "ui/base/android/ui_base_jni_registrar.h" 27 #include "ui/base/android/ui_base_jni_registrar.h"
29 #include "ui/gfx/android/gfx_jni_registrar.h" 28 #include "ui/gfx/android/gfx_jni_registrar.h"
30 #include "ui/gl/android/gl_jni_registrar.h" 29 #include "ui/gl/android/gl_jni_registrar.h"
31 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" 30 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
32 31
33 namespace content { 32 namespace content {
34 33
35 bool EnsureJniRegistered(JNIEnv* env) { 34 bool EnsureJniRegistered(JNIEnv* env) {
(...skipping 20 matching lines...) Expand all
56 55
57 if (!content::android::RegisterCommonJni(env)) 56 if (!content::android::RegisterCommonJni(env))
58 return false; 57 return false;
59 58
60 if (!content::android::RegisterBrowserJni(env)) 59 if (!content::android::RegisterBrowserJni(env))
61 return false; 60 return false;
62 61
63 if (!content::android::RegisterAppJni(env)) 62 if (!content::android::RegisterAppJni(env))
64 return false; 63 return false;
65 64
66 if (!device::android::RegisterBatteryJni(env))
67 return false;
68
69 if (!media::RegisterJni(env)) 65 if (!media::RegisterJni(env))
70 return false; 66 return false;
71 67
72 g_jni_init_done = true; 68 g_jni_init_done = true;
73 } 69 }
74 70
75 return true; 71 return true;
76 } 72 }
77 73
78 bool LibraryLoaded(JNIEnv* env, jclass clazz) { 74 bool LibraryLoaded(JNIEnv* env, jclass clazz) {
(...skipping 26 matching lines...) Expand all
105 false, // Thread ID 101 false, // Thread ID
106 false, // Timestamp 102 false, // Timestamp
107 false); // Tick count 103 false); // Tick count
108 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() 104 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
109 << ", default verbosity = " << logging::GetVlogVerbosity(); 105 << ", default verbosity = " << logging::GetVlogVerbosity();
110 106
111 return EnsureJniRegistered(env); 107 return EnsureJniRegistered(env);
112 } 108 }
113 109
114 } // namespace content 110 } // namespace content
OLDNEW
« no previous file with comments | « content/app/DEPS ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698