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/app/android/library_loader_hooks.h" | 5 #include "content/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/files/file_path.h" | 14 #include "base/files/file_path.h" |
15 #include "base/logging.h" | 15 #include "base/logging.h" |
16 #include "base/strings/string_util.h" | 16 #include "base/strings/string_util.h" |
17 #include "base/trace_event/trace_event.h" | 17 #include "base/trace_event/trace_event.h" |
18 #include "base/tracked_objects.h" | 18 #include "base/tracked_objects.h" |
| 19 #include "components/memory_coordinator/android/component_jni_registrar.h" |
19 #include "components/tracing/browser/trace_config_file.h" | 20 #include "components/tracing/browser/trace_config_file.h" |
20 #include "components/tracing/common/trace_to_console.h" | 21 #include "components/tracing/common/trace_to_console.h" |
21 #include "components/tracing/common/tracing_switches.h" | 22 #include "components/tracing/common/tracing_switches.h" |
22 #include "content/app/android/app_jni_registrar.h" | 23 #include "content/app/android/app_jni_registrar.h" |
23 #include "content/browser/android/browser_jni_registrar.h" | 24 #include "content/browser/android/browser_jni_registrar.h" |
24 #include "content/common/android/common_jni_registrar.h" | 25 #include "content/common/android/common_jni_registrar.h" |
25 #include "content/common/content_constants_internal.h" | 26 #include "content/common/content_constants_internal.h" |
26 #include "content/public/common/content_switches.h" | 27 #include "content/public/common/content_switches.h" |
27 #include "content/public/common/result_codes.h" | 28 #include "content/public/common/result_codes.h" |
28 #include "device/bluetooth/android/bluetooth_jni_registrar.h" | 29 #include "device/bluetooth/android/bluetooth_jni_registrar.h" |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 | 91 |
91 if (!media::RegisterCaptureJni(env)) | 92 if (!media::RegisterCaptureJni(env)) |
92 return false; | 93 return false; |
93 | 94 |
94 if (!media::midi::RegisterJni(env)) | 95 if (!media::midi::RegisterJni(env)) |
95 return false; | 96 return false; |
96 | 97 |
97 if (!media::RegisterScreenCaptureJni(env)) | 98 if (!media::RegisterScreenCaptureJni(env)) |
98 return false; | 99 return false; |
99 | 100 |
| 101 if (!memory_coordinator::android::RegisterJni(env)) |
| 102 return false; |
| 103 |
100 if (!ui::RegisterUIAndroidJni(env)) | 104 if (!ui::RegisterUIAndroidJni(env)) |
101 return false; | 105 return false; |
102 | 106 |
103 g_jni_init_done = true; | 107 g_jni_init_done = true; |
104 } | 108 } |
105 | 109 |
106 return true; | 110 return true; |
107 } | 111 } |
108 | 112 |
109 bool LibraryLoaded(JNIEnv* env, jclass clazz) { | 113 bool LibraryLoaded(JNIEnv* env, jclass clazz) { |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 false, // Thread ID | 152 false, // Thread ID |
149 false, // Timestamp | 153 false, // Timestamp |
150 false); // Tick count | 154 false); // Tick count |
151 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() | 155 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() |
152 << ", default verbosity = " << logging::GetVlogVerbosity(); | 156 << ", default verbosity = " << logging::GetVlogVerbosity(); |
153 | 157 |
154 return true; | 158 return true; |
155 } | 159 } |
156 | 160 |
157 } // namespace content | 161 } // namespace content |
OLD | NEW |