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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/tracing/trace_config_file.cc ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/app/android/library_loader_hooks.cc
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
index 6f9d939aad5d59e47d038e82c17e66791880ae8b..0d36b85924e6cc001eddc9c9bd1248298bf5617d 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -33,7 +33,10 @@
#include "ui/events/android/events_jni_registrar.h"
#include "ui/gfx/android/gfx_jni_registrar.h"
#include "ui/gl/android/gl_jni_registrar.h"
+
+#if !defined(USE_AURA)
#include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
+#endif
namespace content {
@@ -59,8 +62,10 @@ bool EnsureJniRegistered(JNIEnv* env) {
if (!ui::events::android::RegisterJni(env))
return false;
+#if !defined(USE_AURA)
if (!ui::shell_dialogs::RegisterJni(env))
return false;
+#endif
if (!content::android::RegisterCommonJni(env))
return false;
« 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