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

Unified Diff: content/browser/android/content_startup_flags.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
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 acda33ee494b2fe47326d9ecafbebecf485b8112..0606bc21eec7e92087f5f113bddb4c91ed3c2bbd 100644
--- a/content/browser/android/content_startup_flags.cc
+++ b/content/browser/android/content_startup_flags.cc
@@ -80,13 +80,11 @@ void SetContentCommandLineFlags(bool single_process,
switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);
}
-#if !defined(USE_AURA)
cc::LayerSettings layer_settings;
layer_settings.use_compositor_animation_timelines =
!parsed_command_line->HasSwitch(
switches::kDisableAndroidCompositorAnimationTimelines);
Compositor::SetLayerSettings(layer_settings);
-#endif
}
} // namespace content
« no previous file with comments | « content/browser/android/child_process_launcher_android.cc ('k') | content/browser/android/content_video_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698