| 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 "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/vibration/android/vibration_jni_registrar.h" | 25 #include "device/vibration/android/vibration_jni_registrar.h" |
| 26 #include "media/base/android/media_jni_registrar.h" | 26 #include "media/base/android/media_jni_registrar.h" |
| 27 #include "media/midi/midi_jni_registrar.h" |
| 27 #include "net/android/net_jni_registrar.h" | 28 #include "net/android/net_jni_registrar.h" |
| 28 #include "ui/android/ui_android_jni_registrar.h" | 29 #include "ui/android/ui_android_jni_registrar.h" |
| 29 #include "ui/base/android/ui_base_jni_registrar.h" | 30 #include "ui/base/android/ui_base_jni_registrar.h" |
| 30 #include "ui/gfx/android/gfx_jni_registrar.h" | 31 #include "ui/gfx/android/gfx_jni_registrar.h" |
| 31 #include "ui/gl/android/gl_jni_registrar.h" | 32 #include "ui/gl/android/gl_jni_registrar.h" |
| 32 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" | 33 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" |
| 33 | 34 |
| 34 namespace content { | 35 namespace content { |
| 35 | 36 |
| 36 bool EnsureJniRegistered(JNIEnv* env) { | 37 bool EnsureJniRegistered(JNIEnv* env) { |
| (...skipping 26 matching lines...) Expand all Loading... |
| 63 | 64 |
| 64 if (!content::android::RegisterAppJni(env)) | 65 if (!content::android::RegisterAppJni(env)) |
| 65 return false; | 66 return false; |
| 66 | 67 |
| 67 if (!device::android::RegisterVibrationJni(env)) | 68 if (!device::android::RegisterVibrationJni(env)) |
| 68 return false; | 69 return false; |
| 69 | 70 |
| 70 if (!media::RegisterJni(env)) | 71 if (!media::RegisterJni(env)) |
| 71 return false; | 72 return false; |
| 72 | 73 |
| 74 if (!media::midi::RegisterJni(env)) |
| 75 return false; |
| 76 |
| 73 if (!ui::RegisterUIAndroidJni(env)) | 77 if (!ui::RegisterUIAndroidJni(env)) |
| 74 return false; | 78 return false; |
| 75 | 79 |
| 76 g_jni_init_done = true; | 80 g_jni_init_done = true; |
| 77 } | 81 } |
| 78 | 82 |
| 79 return true; | 83 return true; |
| 80 } | 84 } |
| 81 | 85 |
| 82 bool LibraryLoaded(JNIEnv* env, jclass clazz) { | 86 bool LibraryLoaded(JNIEnv* env, jclass clazz) { |
| (...skipping 26 matching lines...) Expand all Loading... |
| 109 false, // Thread ID | 113 false, // Thread ID |
| 110 false, // Timestamp | 114 false, // Timestamp |
| 111 false); // Tick count | 115 false); // Tick count |
| 112 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() | 116 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() |
| 113 << ", default verbosity = " << logging::GetVlogVerbosity(); | 117 << ", default verbosity = " << logging::GetVlogVerbosity(); |
| 114 | 118 |
| 115 return true; | 119 return true; |
| 116 } | 120 } |
| 117 | 121 |
| 118 } // namespace content | 122 } // namespace content |
| OLD | NEW |