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/tracing/trace_config_file.h" | 19 #include "components/tracing/trace_config_file.h" |
20 #include "components/tracing/trace_to_console.h" | 20 #include "components/tracing/trace_to_console.h" |
21 #include "components/tracing/tracing_switches.h" | 21 #include "components/tracing/tracing_switches.h" |
22 #include "content/app/android/app_jni_registrar.h" | 22 #include "content/app/android/app_jni_registrar.h" |
23 #include "content/browser/android/browser_jni_registrar.h" | 23 #include "content/browser/android/browser_jni_registrar.h" |
24 #include "content/common/android/common_jni_registrar.h" | 24 #include "content/common/android/common_jni_registrar.h" |
25 #include "content/common/content_constants_internal.h" | 25 #include "content/common/content_constants_internal.h" |
26 #include "content/public/common/content_switches.h" | 26 #include "content/public/common/content_switches.h" |
27 #include "content/public/common/result_codes.h" | 27 #include "content/public/common/result_codes.h" |
28 #include "device/bluetooth/android/bluetooth_jni_registrar.h" | 28 #include "device/bluetooth/android/bluetooth_jni_registrar.h" |
| 29 #include "device/usb/android/usb_jni_registrar.h" |
29 #include "media/base/android/media_jni_registrar.h" | 30 #include "media/base/android/media_jni_registrar.h" |
30 #include "media/midi/midi_jni_registrar.h" | 31 #include "media/midi/midi_jni_registrar.h" |
31 #include "net/android/net_jni_registrar.h" | 32 #include "net/android/net_jni_registrar.h" |
32 #include "ui/android/ui_android_jni_registrar.h" | 33 #include "ui/android/ui_android_jni_registrar.h" |
33 #include "ui/base/android/ui_base_jni_registrar.h" | 34 #include "ui/base/android/ui_base_jni_registrar.h" |
34 #include "ui/events/android/events_jni_registrar.h" | 35 #include "ui/events/android/events_jni_registrar.h" |
35 #include "ui/gfx/android/gfx_jni_registrar.h" | 36 #include "ui/gfx/android/gfx_jni_registrar.h" |
36 #include "ui/gl/android/gl_jni_registrar.h" | 37 #include "ui/gl/android/gl_jni_registrar.h" |
37 | 38 |
38 #if !defined(USE_AURA) | 39 #if !defined(USE_AURA) |
(...skipping 29 matching lines...) Expand all Loading... |
68 | 69 |
69 if (!content::android::RegisterBrowserJni(env)) | 70 if (!content::android::RegisterBrowserJni(env)) |
70 return false; | 71 return false; |
71 | 72 |
72 if (!content::android::RegisterAppJni(env)) | 73 if (!content::android::RegisterAppJni(env)) |
73 return false; | 74 return false; |
74 | 75 |
75 if (!device::android::RegisterBluetoothJni(env)) | 76 if (!device::android::RegisterBluetoothJni(env)) |
76 return false; | 77 return false; |
77 | 78 |
| 79 if (!device::android::RegisterUsbJni(env)) |
| 80 return false; |
| 81 |
78 if (!media::RegisterJni(env)) | 82 if (!media::RegisterJni(env)) |
79 return false; | 83 return false; |
80 | 84 |
81 if (!media::midi::RegisterJni(env)) | 85 if (!media::midi::RegisterJni(env)) |
82 return false; | 86 return false; |
83 | 87 |
84 #if !defined(USE_AURA) | 88 #if !defined(USE_AURA) |
85 if (!ui::shell_dialogs::RegisterJni(env)) | 89 if (!ui::shell_dialogs::RegisterJni(env)) |
86 return false; | 90 return false; |
87 | 91 |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 false, // Thread ID | 141 false, // Thread ID |
138 false, // Timestamp | 142 false, // Timestamp |
139 false); // Tick count | 143 false); // Tick count |
140 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() | 144 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() |
141 << ", default verbosity = " << logging::GetVlogVerbosity(); | 145 << ", default verbosity = " << logging::GetVlogVerbosity(); |
142 | 146 |
143 return true; | 147 return true; |
144 } | 148 } |
145 | 149 |
146 } // namespace content | 150 } // namespace content |
OLD | NEW |