Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(377)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: content/app/android/library_loader_hooks.cc

Issue 1411503005: Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: One more rebase Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/tracing/trace_config_file.cc ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 15 matching lines...) Expand all
26 #include "content/public/common/result_codes.h" 26 #include "content/public/common/result_codes.h"
27 #include "device/bluetooth/android/bluetooth_jni_registrar.h" 27 #include "device/bluetooth/android/bluetooth_jni_registrar.h"
28 #include "media/base/android/media_jni_registrar.h" 28 #include "media/base/android/media_jni_registrar.h"
29 #include "media/midi/midi_jni_registrar.h" 29 #include "media/midi/midi_jni_registrar.h"
30 #include "net/android/net_jni_registrar.h" 30 #include "net/android/net_jni_registrar.h"
31 #include "ui/android/ui_android_jni_registrar.h" 31 #include "ui/android/ui_android_jni_registrar.h"
32 #include "ui/base/android/ui_base_jni_registrar.h" 32 #include "ui/base/android/ui_base_jni_registrar.h"
33 #include "ui/events/android/events_jni_registrar.h" 33 #include "ui/events/android/events_jni_registrar.h"
34 #include "ui/gfx/android/gfx_jni_registrar.h" 34 #include "ui/gfx/android/gfx_jni_registrar.h"
35 #include "ui/gl/android/gl_jni_registrar.h" 35 #include "ui/gl/android/gl_jni_registrar.h"
36
37 #if !defined(USE_AURA)
36 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" 38 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
39 #endif
37 40
38 namespace content { 41 namespace content {
39 42
40 bool EnsureJniRegistered(JNIEnv* env) { 43 bool EnsureJniRegistered(JNIEnv* env) {
41 static bool g_jni_init_done = false; 44 static bool g_jni_init_done = false;
42 45
43 if (!g_jni_init_done) { 46 if (!g_jni_init_done) {
44 if (!base::android::RegisterJni(env)) 47 if (!base::android::RegisterJni(env))
45 return false; 48 return false;
46 49
47 if (!gfx::android::RegisterJni(env)) 50 if (!gfx::android::RegisterJni(env))
48 return false; 51 return false;
49 52
50 if (!net::android::RegisterJni(env)) 53 if (!net::android::RegisterJni(env))
51 return false; 54 return false;
52 55
53 if (!ui::android::RegisterJni(env)) 56 if (!ui::android::RegisterJni(env))
54 return false; 57 return false;
55 58
56 if (!ui::gl::android::RegisterJni(env)) 59 if (!ui::gl::android::RegisterJni(env))
57 return false; 60 return false;
58 61
59 if (!ui::events::android::RegisterJni(env)) 62 if (!ui::events::android::RegisterJni(env))
60 return false; 63 return false;
61 64
65 #if !defined(USE_AURA)
62 if (!ui::shell_dialogs::RegisterJni(env)) 66 if (!ui::shell_dialogs::RegisterJni(env))
63 return false; 67 return false;
68 #endif
64 69
65 if (!content::android::RegisterCommonJni(env)) 70 if (!content::android::RegisterCommonJni(env))
66 return false; 71 return false;
67 72
68 if (!content::android::RegisterBrowserJni(env)) 73 if (!content::android::RegisterBrowserJni(env))
69 return false; 74 return false;
70 75
71 if (!content::android::RegisterAppJni(env)) 76 if (!content::android::RegisterAppJni(env))
72 return false; 77 return false;
73 78
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 false, // Thread ID 127 false, // Thread ID
123 false, // Timestamp 128 false, // Timestamp
124 false); // Tick count 129 false); // Tick count
125 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() 130 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
126 << ", default verbosity = " << logging::GetVlogVerbosity(); 131 << ", default verbosity = " << logging::GetVlogVerbosity();
127 132
128 return true; 133 return true;
129 } 134 }
130 135
131 } // namespace content 136 } // namespace content
OLDNEW
« no previous file with comments | « components/tracing/trace_config_file.cc ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698