content/browser/android/content_startup_flags.cc - Issue 1411503005: Aura on Android: content/browser

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/browser/android/content_startup_flags.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 side-by-side diff with in-line comments

Download patch

« content/browser/android/browser_jni_registrar.cc ('K') | « content/browser/android/child_process_launcher_android.cc ('k') | content/browser/android/content_video_view.cc » ('j') | content/browser/android/content_video_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/content_startup_flags.cc

diff --git a/content/browser/android/content_startup_flags.cc b/content/browser/android/content_startup_flags.cc

index 9821566fdd57193af7d8a84b44afae562e7f4d34..c8376320688b121f59aa0ac0e06afbbe6678c630 100644

--- a/content/browser/android/content_startup_flags.cc

+++ b/content/browser/android/content_startup_flags.cc

@@ -99,11 +99,13 @@ void SetContentCommandLineFlags(bool single_process,

switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);

}

+#if !defined(USE_AURA)

cc::LayerSettings layer_settings;

if (parsed_command_line->HasSwitch(

switches::kEnableAndroidCompositorAnimationTimelines))

layer_settings.use_compositor_animation_timelines = true;

Compositor::SetLayerSettings(layer_settings);

+#endif

}

} // namespace content