| 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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 | 155 |
| 156 if (command_line.HasSwitch(switches::kRunLayoutTest)) { | 156 if (command_line.HasSwitch(switches::kRunLayoutTest)) { |
| 157 EnableBrowserLayoutTestMode(); | 157 EnableBrowserLayoutTestMode(); |
| 158 | 158 |
| 159 #if defined(ENABLE_PLUGINS) | 159 #if defined(ENABLE_PLUGINS) |
| 160 if (!ppapi::RegisterBlinkTestPlugin(&command_line)) { | 160 if (!ppapi::RegisterBlinkTestPlugin(&command_line)) { |
| 161 *exit_code = 1; | 161 *exit_code = 1; |
| 162 return true; | 162 return true; |
| 163 } | 163 } |
| 164 #endif | 164 #endif |
| 165 command_line.AppendSwitch(cc::switches::kEnableGpuBenchmarking); |
| 165 command_line.AppendSwitch(switches::kProcessPerTab); | 166 command_line.AppendSwitch(switches::kProcessPerTab); |
| 166 command_line.AppendSwitch(switches::kEnableLogging); | 167 command_line.AppendSwitch(switches::kEnableLogging); |
| 167 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); | 168 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); |
| 168 // only default to osmesa if the flag isn't already specified. | 169 // only default to osmesa if the flag isn't already specified. |
| 169 if (!command_line.HasSwitch(switches::kUseGL)) { | 170 if (!command_line.HasSwitch(switches::kUseGL)) { |
| 170 command_line.AppendSwitchASCII(switches::kUseGL, | 171 command_line.AppendSwitchASCII(switches::kUseGL, |
| 171 gl::kGLImplementationOSMesaName); | 172 gl::kGLImplementationOSMesaName); |
| 172 } | 173 } |
| 173 command_line.AppendSwitch(switches::kSkipGpuDataLoading); | 174 command_line.AppendSwitch(switches::kSkipGpuDataLoading); |
| 174 command_line.AppendSwitchASCII(switches::kTouchEvents, | 175 command_line.AppendSwitchASCII(switches::kTouchEvents, |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 | 367 |
| 367 return renderer_client_.get(); | 368 return renderer_client_.get(); |
| 368 } | 369 } |
| 369 | 370 |
| 370 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { | 371 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { |
| 371 utility_client_.reset(new ShellContentUtilityClient); | 372 utility_client_.reset(new ShellContentUtilityClient); |
| 372 return utility_client_.get(); | 373 return utility_client_.get(); |
| 373 } | 374 } |
| 374 | 375 |
| 375 } // namespace content | 376 } // namespace content |
| OLD | NEW |