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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/app/shell_main_delegate.h" 5 #include "content/shell/app/shell_main_delegate.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/cpu.h" 9 #include "base/cpu.h"
10 #include "base/files/file.h" 10 #include "base/files/file.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 command_line.AppendSwitch(switches::kDisableImplSidePainting); 169 command_line.AppendSwitch(switches::kDisableImplSidePainting);
170 // Text blobs are normally disabled when kDisableImplSidePainting is 170 // Text blobs are normally disabled when kDisableImplSidePainting is
171 // present to ensure correct LCD behavior, but for layout tests we want 171 // present to ensure correct LCD behavior, but for layout tests we want
172 // them on because LCD is always suppressed. 172 // them on because LCD is always suppressed.
173 command_line.AppendSwitch(switches::kForceTextBlobs); 173 command_line.AppendSwitch(switches::kForceTextBlobs);
174 } 174 }
175 175
176 command_line.AppendSwitch(switches::kEnableInbandTextTracks); 176 command_line.AppendSwitch(switches::kEnableInbandTextTracks);
177 command_line.AppendSwitch(switches::kMuteAudio); 177 command_line.AppendSwitch(switches::kMuteAudio);
178 178
179 #if defined(USE_AURA) || defined(OS_ANDROID) || defined(OS_MACOSX)
180 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. 179 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer.
181 command_line.AppendSwitch(switches::kDisableDelegatedRenderer); 180 command_line.AppendSwitch(switches::kDisableDelegatedRenderer);
182 command_line.AppendSwitch(cc::switches::kCompositeToMailbox); 181 command_line.AppendSwitch(cc::switches::kCompositeToMailbox);
183 #endif
184 182
185 command_line.AppendSwitch(switches::kEnableFileCookies); 183 command_line.AppendSwitch(switches::kEnableFileCookies);
186 184
187 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo); 185 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo);
188 186
189 command_line.AppendSwitchASCII(switches::kHostResolverRules, 187 command_line.AppendSwitchASCII(switches::kHostResolverRules,
190 "MAP *.test 127.0.0.1"); 188 "MAP *.test 127.0.0.1");
191 189
192 // Unless/until WebM files are added to the media layout tests, we need to 190 // Unless/until WebM files are added to the media layout tests, we need to
193 // avoid removing MP4/H264/AAC so that layout tests can run on Android. 191 // avoid removing MP4/H264/AAC so that layout tests can run on Android.
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 322 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
325 renderer_client_.reset( 323 renderer_client_.reset(
326 CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree) ? 324 CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree) ?
327 new LayoutTestContentRendererClient : 325 new LayoutTestContentRendererClient :
328 new ShellContentRendererClient); 326 new ShellContentRendererClient);
329 327
330 return renderer_client_.get(); 328 return renderer_client_.get();
331 } 329 }
332 330
333 } // namespace content 331 } // namespace content
OLDNEW
« 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