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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 167 command_line.AppendSwitchASCII(switches::kUseGL, | 167 command_line.AppendSwitchASCII(switches::kUseGL, |
| 168 gfx::kGLImplementationOSMesaName); | 168 gfx::kGLImplementationOSMesaName); |
| 169 } | 169 } |
| 170 command_line.AppendSwitch(switches::kSkipGpuDataLoading); | 170 command_line.AppendSwitch(switches::kSkipGpuDataLoading); |
| 171 command_line.AppendSwitchASCII(switches::kTouchEvents, | 171 command_line.AppendSwitchASCII(switches::kTouchEvents, |
| 172 switches::kTouchEventsEnabled); | 172 switches::kTouchEventsEnabled); |
| 173 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor)) | 173 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor)) |
| 174 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); | 174 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); |
| 175 command_line.AppendSwitch( | 175 command_line.AppendSwitch( |
| 176 switches::kDisableGestureRequirementForMediaPlayback); | 176 switches::kDisableGestureRequirementForMediaPlayback); |
| 177 command_line.AppendSwitch( | |
|
whywhat
2016/02/04 20:39:08
This is not used I think? It would disable the req
Zhiqiang Zhang (Slow)
2016/02/05 16:20:33
Done.
| |
| 178 switches::kDisableGestureRequirementForPresentation); | |
| 177 | 179 |
| 178 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { | 180 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { |
| 179 command_line.AppendSwitch( | 181 command_line.AppendSwitch( |
| 180 switches::kEnableExperimentalWebPlatformFeatures); | 182 switches::kEnableExperimentalWebPlatformFeatures); |
| 181 // Only enable WebBluetooth during Layout Tests in non release mode. | 183 // Only enable WebBluetooth during Layout Tests in non release mode. |
| 182 command_line.AppendSwitch(switches::kEnableWebBluetooth); | 184 command_line.AppendSwitch(switches::kEnableWebBluetooth); |
| 183 } | 185 } |
| 184 | 186 |
| 185 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) { | 187 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) { |
| 186 command_line.AppendSwitch(switches::kDisableThreadedCompositing); | 188 command_line.AppendSwitch(switches::kDisableThreadedCompositing); |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 352 | 354 |
| 353 return renderer_client_.get(); | 355 return renderer_client_.get(); |
| 354 } | 356 } |
| 355 | 357 |
| 356 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { | 358 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { |
| 357 utility_client_.reset(new ShellContentUtilityClient); | 359 utility_client_.reset(new ShellContentUtilityClient); |
| 358 return utility_client_.get(); | 360 return utility_client_.get(); |
| 359 } | 361 } |
| 360 | 362 |
| 361 } // namespace content | 363 } // namespace content |
| OLD | NEW |