Chromium Code Reviews| 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 151 EnableBrowserLayoutTestMode(); | 151 EnableBrowserLayoutTestMode(); |
| 152 | 152 |
| 153 command_line.AppendSwitch(switches::kProcessPerTab); | 153 command_line.AppendSwitch(switches::kProcessPerTab); |
| 154 command_line.AppendSwitch(switches::kEnableLogging); | 154 command_line.AppendSwitch(switches::kEnableLogging); |
| 155 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); | 155 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); |
| 156 // only default to osmesa if the flag isn't already specified. | 156 // only default to osmesa if the flag isn't already specified. |
| 157 if (!command_line.HasSwitch(switches::kUseGL)) { | 157 if (!command_line.HasSwitch(switches::kUseGL)) { |
| 158 command_line.AppendSwitchASCII(switches::kUseGL, | 158 command_line.AppendSwitchASCII(switches::kUseGL, |
| 159 gfx::kGLImplementationOSMesaName); | 159 gfx::kGLImplementationOSMesaName); |
| 160 } | 160 } |
| 161 command_line.AppendSwitch(switches::kSkipGpuDataLoading); | |
|
Ken Russell (switch to Gerrit)
2015/10/15 21:30:28
Slightly concerned about this change since it may
sivag
2015/10/16 18:29:19
when we run layout test, we skip collecting vendor
| |
| 162 command_line.AppendSwitchASCII(switches::kTouchEvents, | 161 command_line.AppendSwitchASCII(switches::kTouchEvents, |
| 163 switches::kTouchEventsEnabled); | 162 switches::kTouchEventsEnabled); |
| 164 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); | 163 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); |
| 165 #if defined(OS_ANDROID) | 164 #if defined(OS_ANDROID) |
| 166 command_line.AppendSwitch( | 165 command_line.AppendSwitch( |
| 167 switches::kDisableGestureRequirementForMediaPlayback); | 166 switches::kDisableGestureRequirementForMediaPlayback); |
| 168 #endif | 167 #endif |
| 169 | 168 |
| 170 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { | 169 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { |
| 171 command_line.AppendSwitch( | 170 command_line.AppendSwitch( |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 345 | 344 |
| 346 return renderer_client_.get(); | 345 return renderer_client_.get(); |
| 347 } | 346 } |
| 348 | 347 |
| 349 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { | 348 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { |
| 350 utility_client_.reset(new ShellContentUtilityClient); | 349 utility_client_.reset(new ShellContentUtilityClient); |
| 351 return utility_client_.get(); | 350 return utility_client_.get(); |
| 352 } | 351 } |
| 353 | 352 |
| 354 } // namespace content | 353 } // namespace content |
| OLD | NEW |