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

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: Addressing some feedback. Fixes for content/child and content/public/browser targets. 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') | content/browser/BUILD.gn » ('J')
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 14 matching lines...) Expand all
25 #include "content/public/common/content_switches.h" 25 #include "content/public/common/content_switches.h"
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/gfx/android/gfx_jni_registrar.h" 33 #include "ui/gfx/android/gfx_jni_registrar.h"
34 #include "ui/gl/android/gl_jni_registrar.h" 34 #include "ui/gl/android/gl_jni_registrar.h"
35
36 #if !defined(USE_AURA)
35 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" 37 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
38 #endif
36 39
37 namespace content { 40 namespace content {
38 41
39 bool EnsureJniRegistered(JNIEnv* env) { 42 bool EnsureJniRegistered(JNIEnv* env) {
40 static bool g_jni_init_done = false; 43 static bool g_jni_init_done = false;
41 44
42 if (!g_jni_init_done) { 45 if (!g_jni_init_done) {
43 if (!base::android::RegisterJni(env)) 46 if (!base::android::RegisterJni(env))
44 return false; 47 return false;
45 48
46 if (!gfx::android::RegisterJni(env)) 49 if (!gfx::android::RegisterJni(env))
47 return false; 50 return false;
48 51
49 if (!net::android::RegisterJni(env)) 52 if (!net::android::RegisterJni(env))
50 return false; 53 return false;
51 54
52 if (!ui::android::RegisterJni(env)) 55 if (!ui::android::RegisterJni(env))
53 return false; 56 return false;
54 57
55 if (!ui::gl::android::RegisterJni(env)) 58 if (!ui::gl::android::RegisterJni(env))
56 return false; 59 return false;
57 60
61 #if !defined(USE_AURA)
58 if (!ui::shell_dialogs::RegisterJni(env)) 62 if (!ui::shell_dialogs::RegisterJni(env))
59 return false; 63 return false;
64 #endif
60 65
61 if (!content::android::RegisterCommonJni(env)) 66 if (!content::android::RegisterCommonJni(env))
62 return false; 67 return false;
63 68
64 if (!content::android::RegisterBrowserJni(env)) 69 if (!content::android::RegisterBrowserJni(env))
65 return false; 70 return false;
66 71
67 if (!content::android::RegisterAppJni(env)) 72 if (!content::android::RegisterAppJni(env))
68 return false; 73 return false;
69 74
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 false, // Thread ID 123 false, // Thread ID
119 false, // Timestamp 124 false, // Timestamp
120 false); // Tick count 125 false); // Tick count
121 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() 126 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
122 << ", default verbosity = " << logging::GetVlogVerbosity(); 127 << ", default verbosity = " << logging::GetVlogVerbosity();
123 128
124 return true; 129 return true;
125 } 130 }
126 131
127 } // namespace content 132 } // namespace content
OLDNEW
« no previous file with comments | « components/tracing/trace_config_file.cc ('k') | content/browser/BUILD.gn » ('j') | content/browser/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698