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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Created 5 years, 2 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
« content/browser/android/child_process_launcher_android.cc ('K') | « content/browser/android/child_process_launcher_android.cc ('k') | content/browser/android/content_view_core_impl.cc » ('j') | content/browser/android/content_view_core_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 2f0c632c85ece81a9606cab00dc3a2329f23496b..42eb528e2ab03384a219d1e20ded346a8ab98da7 100644
--- a/content/browser/android/content_startup_flags.cc
+++ b/content/browser/android/content_startup_flags.cc
@@ -100,11 +100,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
« content/browser/android/child_process_launcher_android.cc ('K') | « content/browser/android/child_process_launcher_android.cc ('k') | content/browser/android/content_view_core_impl.cc » ('j') | content/browser/android/content_view_core_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698