| 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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 switches::kTouchEventFeatureDetectionEnabled); | 182 switches::kTouchEventFeatureDetectionEnabled); |
| 183 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor)) | 183 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor)) |
| 184 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); | 184 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); |
| 185 command_line.AppendSwitch(switches::kIgnoreAutoplayRestrictionsForTests); | 185 command_line.AppendSwitch(switches::kIgnoreAutoplayRestrictionsForTests); |
| 186 | 186 |
| 187 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { | 187 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { |
| 188 command_line.AppendSwitch( | 188 command_line.AppendSwitch( |
| 189 switches::kEnableExperimentalWebPlatformFeatures); | 189 switches::kEnableExperimentalWebPlatformFeatures); |
| 190 } | 190 } |
| 191 | 191 |
| 192 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) { | |
| 193 command_line.AppendSwitch(switches::kDisableThreadedCompositing); | |
| 194 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); | |
| 195 } | |
| 196 | |
| 197 if (!command_line.HasSwitch(switches::kEnableDisplayList2dCanvas)) { | 192 if (!command_line.HasSwitch(switches::kEnableDisplayList2dCanvas)) { |
| 198 command_line.AppendSwitch(switches::kDisableDisplayList2dCanvas); | 193 command_line.AppendSwitch(switches::kDisableDisplayList2dCanvas); |
| 199 } | 194 } |
| 200 | 195 |
| 201 command_line.AppendSwitch(switches::kEnableInbandTextTracks); | 196 command_line.AppendSwitch(switches::kEnableInbandTextTracks); |
| 202 command_line.AppendSwitch(switches::kMuteAudio); | 197 command_line.AppendSwitch(switches::kMuteAudio); |
| 203 | 198 |
| 204 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo); | 199 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo); |
| 205 | 200 |
| 206 command_line.AppendSwitchASCII(switches::kHostResolverRules, | 201 command_line.AppendSwitchASCII(switches::kHostResolverRules, |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 386 | 381 |
| 387 return renderer_client_.get(); | 382 return renderer_client_.get(); |
| 388 } | 383 } |
| 389 | 384 |
| 390 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { | 385 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { |
| 391 utility_client_.reset(new ShellContentUtilityClient); | 386 utility_client_.reset(new ShellContentUtilityClient); |
| 392 return utility_client_.get(); | 387 return utility_client_.get(); |
| 393 } | 388 } |
| 394 | 389 |
| 395 } // namespace content | 390 } // namespace content |
| OLD | NEW |