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

Unified Diff: content/shell/app/shell_main_delegate.cc

Issue 780343002: Remove always true guard (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix comment Created 6 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
« no previous file with comments | « content/renderer/render_widget.cc ('k') | content/test/test_render_view_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/app/shell_main_delegate.cc
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index fffc4ab51cb8f887dfdfdcba5a3dc71a45142e7d..914c2644d6c6c6caa26ceac5d860c75e6b1e175a 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -176,11 +176,9 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
command_line.AppendSwitch(switches::kEnableInbandTextTracks);
command_line.AppendSwitch(switches::kMuteAudio);
-#if defined(USE_AURA) || defined(OS_ANDROID) || defined(OS_MACOSX)
// TODO: crbug.com/311404 Make layout tests work w/ delegated renderer.
command_line.AppendSwitch(switches::kDisableDelegatedRenderer);
command_line.AppendSwitch(cc::switches::kCompositeToMailbox);
-#endif
command_line.AppendSwitch(switches::kEnableFileCookies);
« no previous file with comments | « content/renderer/render_widget.cc ('k') | content/test/test_render_view_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698