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 "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" |
25 #include "media/base/android/media_jni_registrar.h" | 26 #include "media/base/android/media_jni_registrar.h" |
26 #include "net/android/net_jni_registrar.h" | 27 #include "net/android/net_jni_registrar.h" |
27 #include "ui/base/android/ui_base_jni_registrar.h" | 28 #include "ui/base/android/ui_base_jni_registrar.h" |
28 #include "ui/gfx/android/gfx_jni_registrar.h" | 29 #include "ui/gfx/android/gfx_jni_registrar.h" |
29 #include "ui/gl/android/gl_jni_registrar.h" | 30 #include "ui/gl/android/gl_jni_registrar.h" |
30 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" | 31 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" |
31 | 32 |
32 namespace content { | 33 namespace content { |
33 | 34 |
34 bool EnsureJniRegistered(JNIEnv* env) { | 35 bool EnsureJniRegistered(JNIEnv* env) { |
(...skipping 20 matching lines...) Expand all Loading... |
55 | 56 |
56 if (!content::android::RegisterCommonJni(env)) | 57 if (!content::android::RegisterCommonJni(env)) |
57 return false; | 58 return false; |
58 | 59 |
59 if (!content::android::RegisterBrowserJni(env)) | 60 if (!content::android::RegisterBrowserJni(env)) |
60 return false; | 61 return false; |
61 | 62 |
62 if (!content::android::RegisterAppJni(env)) | 63 if (!content::android::RegisterAppJni(env)) |
63 return false; | 64 return false; |
64 | 65 |
| 66 if (!device::android::RegisterBatteryJni(env)) |
| 67 return false; |
| 68 |
65 if (!media::RegisterJni(env)) | 69 if (!media::RegisterJni(env)) |
66 return false; | 70 return false; |
67 | 71 |
68 g_jni_init_done = true; | 72 g_jni_init_done = true; |
69 } | 73 } |
70 | 74 |
71 return true; | 75 return true; |
72 } | 76 } |
73 | 77 |
74 bool LibraryLoaded(JNIEnv* env, jclass clazz) { | 78 bool LibraryLoaded(JNIEnv* env, jclass clazz) { |
(...skipping 26 matching lines...) Expand all Loading... |
101 false, // Thread ID | 105 false, // Thread ID |
102 false, // Timestamp | 106 false, // Timestamp |
103 false); // Tick count | 107 false); // Tick count |
104 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() | 108 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() |
105 << ", default verbosity = " << logging::GetVlogVerbosity(); | 109 << ", default verbosity = " << logging::GetVlogVerbosity(); |
106 | 110 |
107 return EnsureJniRegistered(env); | 111 return EnsureJniRegistered(env); |
108 } | 112 } |
109 | 113 |
110 } // namespace content | 114 } // namespace content |
OLD | NEW |