content/shell/android/shell_library_loader.cc - Issue 1469803006: NOT FOR REVIEW: Aura Android: Content Shell compiles

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/android/shell_library_loader.cc

Issue 1469803006: NOT FOR REVIEW: Aura Android: Content Shell compiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_wthandroid

Patch Set: Temp Created 5 years 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

Index: content/shell/android/shell_library_loader.cc

diff --git a/content/shell/android/shell_library_loader.cc b/content/shell/android/shell_library_loader.cc

index d9b3d28b229148bbdc67e17b81ca47ce15a679d1..5f99d816bedf3de40640c2b0f839bbad6373cb0a 100644

--- a/content/shell/android/shell_library_loader.cc

+++ b/content/shell/android/shell_library_loader.cc

@@ -17,7 +17,9 @@ bool RegisterJNI(JNIEnv* env) {

}

bool Init() {

+#if !defined(USE_AURA)

content::Compositor::Initialize();

+#endif

content::SetContentMainDelegate(new content::ShellMainDelegate());

return true;

}

« no previous file with comments | « content/shell/android/shell_jni_registrar.cc ('k') | content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »