OLD | NEW |
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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 command_line.AppendSwitch(switches::kDisableDisplayList2dCanvas); | 183 command_line.AppendSwitch(switches::kDisableDisplayList2dCanvas); |
184 } | 184 } |
185 | 185 |
186 command_line.AppendSwitch(switches::kEnableInbandTextTracks); | 186 command_line.AppendSwitch(switches::kEnableInbandTextTracks); |
187 command_line.AppendSwitch(switches::kMuteAudio); | 187 command_line.AppendSwitch(switches::kMuteAudio); |
188 | 188 |
189 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. | 189 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. |
190 command_line.AppendSwitch(switches::kDisableDelegatedRenderer); | 190 command_line.AppendSwitch(switches::kDisableDelegatedRenderer); |
191 command_line.AppendSwitch(cc::switches::kCompositeToMailbox); | 191 command_line.AppendSwitch(cc::switches::kCompositeToMailbox); |
192 | 192 |
193 command_line.AppendSwitch(cc::switches::kEnablePropertyTreeVerification); | |
194 | |
195 command_line.AppendSwitch(switches::kEnableFileCookies); | |
196 | |
197 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo); | 193 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo); |
198 | 194 |
199 command_line.AppendSwitchASCII(switches::kHostResolverRules, | 195 command_line.AppendSwitchASCII(switches::kHostResolverRules, |
200 "MAP *.test 127.0.0.1"); | 196 "MAP *.test 127.0.0.1"); |
201 | 197 |
202 // TODO(wfh): crbug.com/295137 Remove this when NPAPI is gone. | 198 // TODO(wfh): crbug.com/295137 Remove this when NPAPI is gone. |
203 command_line.AppendSwitch(switches::kEnableNpapi); | 199 command_line.AppendSwitch(switches::kEnableNpapi); |
204 | 200 |
205 // Unless/until WebM files are added to the media layout tests, we need to | 201 // Unless/until WebM files are added to the media layout tests, we need to |
206 // avoid removing MP4/H264/AAC so that layout tests can run on Android. | 202 // 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 Loading... |
337 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { | 333 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { |
338 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch( | 334 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch( |
339 switches::kRunLayoutTest) | 335 switches::kRunLayoutTest) |
340 ? new LayoutTestContentRendererClient | 336 ? new LayoutTestContentRendererClient |
341 : new ShellContentRendererClient); | 337 : new ShellContentRendererClient); |
342 | 338 |
343 return renderer_client_.get(); | 339 return renderer_client_.get(); |
344 } | 340 } |
345 | 341 |
346 } // namespace content | 342 } // namespace content |
OLD | NEW |