| 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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 command_line.AppendSwitchASCII( | 174 command_line.AppendSwitchASCII( |
| 175 switches::kUseGL, | 175 switches::kUseGL, |
| 176 gl::GetGLImplementationName(gl::GetSoftwareGLImplementation())); | 176 gl::GetGLImplementationName(gl::GetSoftwareGLImplementation())); |
| 177 } | 177 } |
| 178 command_line.AppendSwitch(switches::kSkipGpuDataLoading); | 178 command_line.AppendSwitch(switches::kSkipGpuDataLoading); |
| 179 command_line.AppendSwitchASCII( | 179 command_line.AppendSwitchASCII( |
| 180 switches::kTouchEventFeatureDetection, | 180 switches::kTouchEventFeatureDetection, |
| 181 switches::kTouchEventFeatureDetectionEnabled); | 181 switches::kTouchEventFeatureDetectionEnabled); |
| 182 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor)) | 182 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor)) |
| 183 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); | 183 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); |
| 184 command_line.AppendSwitch( | 184 command_line.AppendSwitch(switches::kIgnoreAutoplayRestrictionsForTests); |
| 185 switches::kDisableGestureRequirementForMediaPlayback); | |
| 186 | 185 |
| 187 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { | 186 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { |
| 188 command_line.AppendSwitch( | 187 command_line.AppendSwitch( |
| 189 switches::kEnableExperimentalWebPlatformFeatures); | 188 switches::kEnableExperimentalWebPlatformFeatures); |
| 190 } | 189 } |
| 191 | 190 |
| 192 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) { | 191 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) { |
| 193 command_line.AppendSwitch(switches::kDisableThreadedCompositing); | 192 command_line.AppendSwitch(switches::kDisableThreadedCompositing); |
| 194 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); | 193 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); |
| 195 } | 194 } |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 | 369 |
| 371 return renderer_client_.get(); | 370 return renderer_client_.get(); |
| 372 } | 371 } |
| 373 | 372 |
| 374 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { | 373 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { |
| 375 utility_client_.reset(new ShellContentUtilityClient); | 374 utility_client_.reset(new ShellContentUtilityClient); |
| 376 return utility_client_.get(); | 375 return utility_client_.get(); |
| 377 } | 376 } |
| 378 | 377 |
| 379 } // namespace content | 378 } // namespace content |
| OLD | NEW |