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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 *exit_code = 1; | 161 *exit_code = 1; |
162 return true; | 162 return true; |
163 } | 163 } |
164 #endif | 164 #endif |
165 command_line.AppendSwitch(switches::kProcessPerTab); | 165 command_line.AppendSwitch(switches::kProcessPerTab); |
166 command_line.AppendSwitch(switches::kEnableLogging); | 166 command_line.AppendSwitch(switches::kEnableLogging); |
167 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); | 167 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); |
168 // only default to osmesa if the flag isn't already specified. | 168 // only default to osmesa if the flag isn't already specified. |
169 if (!command_line.HasSwitch(switches::kUseGL)) { | 169 if (!command_line.HasSwitch(switches::kUseGL)) { |
170 command_line.AppendSwitchASCII(switches::kUseGL, | 170 command_line.AppendSwitchASCII(switches::kUseGL, |
171 gfx::kGLImplementationOSMesaName); | 171 gl::kGLImplementationOSMesaName); |
172 } | 172 } |
173 command_line.AppendSwitch(switches::kSkipGpuDataLoading); | 173 command_line.AppendSwitch(switches::kSkipGpuDataLoading); |
174 command_line.AppendSwitchASCII(switches::kTouchEvents, | 174 command_line.AppendSwitchASCII(switches::kTouchEvents, |
175 switches::kTouchEventsEnabled); | 175 switches::kTouchEventsEnabled); |
176 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor)) | 176 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor)) |
177 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); | 177 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); |
178 command_line.AppendSwitch( | 178 command_line.AppendSwitch( |
179 switches::kDisableGestureRequirementForMediaPlayback); | 179 switches::kDisableGestureRequirementForMediaPlayback); |
180 | 180 |
181 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { | 181 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 | 366 |
367 return renderer_client_.get(); | 367 return renderer_client_.get(); |
368 } | 368 } |
369 | 369 |
370 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { | 370 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { |
371 utility_client_.reset(new ShellContentUtilityClient); | 371 utility_client_.reset(new ShellContentUtilityClient); |
372 return utility_client_.get(); | 372 return utility_client_.get(); |
373 } | 373 } |
374 | 374 |
375 } // namespace content | 375 } // namespace content |
OLD | NEW |