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" |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 | 96 |
97 if (!device::android::RegisterUsbJni(env)) | 97 if (!device::android::RegisterUsbJni(env)) |
98 return false; | 98 return false; |
99 | 99 |
100 if (!media::RegisterJni(env)) | 100 if (!media::RegisterJni(env)) |
101 return false; | 101 return false; |
102 | 102 |
103 if (!media::RegisterCaptureJni(env)) | 103 if (!media::RegisterCaptureJni(env)) |
104 return false; | 104 return false; |
105 | 105 |
106 if (!media::midi::RegisterJni(env)) | |
107 return false; | |
108 | |
109 if (!media::RegisterScreenCaptureJni(env)) | 106 if (!media::RegisterScreenCaptureJni(env)) |
110 return false; | 107 return false; |
111 | 108 |
| 109 if (!midi::RegisterJni(env)) |
| 110 return false; |
| 111 |
112 if (!ui::RegisterUIAndroidJni(env)) | 112 if (!ui::RegisterUIAndroidJni(env)) |
113 return false; | 113 return false; |
114 | 114 |
115 g_jni_init_done = true; | 115 g_jni_init_done = true; |
116 } | 116 } |
117 | 117 |
118 return true; | 118 return true; |
119 } | 119 } |
120 | 120 |
121 bool LibraryLoaded(JNIEnv* env, jclass clazz) { | 121 bool LibraryLoaded(JNIEnv* env, jclass clazz) { |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 false, // Thread ID | 160 false, // Thread ID |
161 false, // Timestamp | 161 false, // Timestamp |
162 false); // Tick count | 162 false); // Tick count |
163 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() | 163 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() |
164 << ", default verbosity = " << logging::GetVlogVerbosity(); | 164 << ", default verbosity = " << logging::GetVlogVerbosity(); |
165 | 165 |
166 return true; | 166 return true; |
167 } | 167 } |
168 | 168 |
169 } // namespace content | 169 } // namespace content |
OLD | NEW |