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

Unified Diff: content/app/android/library_loader_hooks.cc

Issue 1649483002: Revert of Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
Patch Set: Merging android_non_aura_browser_sources into android_browser_sources rather than private_browser_s… Created 4 years, 11 months 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 3bf7c5c304c8a50df2c8f14d08a79903f9266c6d..dd14cc11a21a51331a26c58ce6b113a42ce68c8e 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -35,10 +35,7 @@
#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 {
@@ -64,10 +61,8 @@ 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