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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
164 switches::kTouchEventsEnabled); | 164 switches::kTouchEventsEnabled); |
165 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); | 165 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); |
166 #if defined(OS_ANDROID) | 166 #if defined(OS_ANDROID) |
167 command_line.AppendSwitch( | 167 command_line.AppendSwitch( |
168 switches::kDisableGestureRequirementForMediaPlayback); | 168 switches::kDisableGestureRequirementForMediaPlayback); |
169 #endif | 169 #endif |
170 | 170 |
171 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { | 171 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { |
172 command_line.AppendSwitch( | 172 command_line.AppendSwitch( |
173 switches::kEnableExperimentalWebPlatformFeatures); | 173 switches::kEnableExperimentalWebPlatformFeatures); |
174 // Only enable WebBluetooth during Layout Tests in non release mode. | |
175 command_line.AppendSwitch(switches::kEnableWebBluetooth); | |
jochen (gone - plz use gerrit)
2015/05/15 06:11:33
layout test related flags should go into the layou
ortuno
2015/05/15 16:31:14
The purpose of this set of patches is to extract t
| |
174 } | 176 } |
175 | 177 |
176 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) { | 178 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) { |
177 command_line.AppendSwitch(switches::kDisableThreadedCompositing); | 179 command_line.AppendSwitch(switches::kDisableThreadedCompositing); |
178 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); | 180 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); |
179 // Text blobs are normally disabled when kDisableImplSidePainting is | 181 // Text blobs are normally disabled when kDisableImplSidePainting is |
180 // present to ensure correct LCD behavior, but for layout tests we want | 182 // present to ensure correct LCD behavior, but for layout tests we want |
181 // them on because LCD is always suppressed. | 183 // them on because LCD is always suppressed. |
182 command_line.AppendSwitch(switches::kForceTextBlobs); | 184 command_line.AppendSwitch(switches::kForceTextBlobs); |
183 } | 185 } |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
338 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { | 340 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { |
339 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch( | 341 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch( |
340 switches::kRunLayoutTest) | 342 switches::kRunLayoutTest) |
341 ? new LayoutTestContentRendererClient | 343 ? new LayoutTestContentRendererClient |
342 : new ShellContentRendererClient); | 344 : new ShellContentRendererClient); |
343 | 345 |
344 return renderer_client_.get(); | 346 return renderer_client_.get(); |
345 } | 347 } |
346 | 348 |
347 } // namespace content | 349 } // namespace content |
OLD | NEW |