| 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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 | 139 |
| 140 command_line.AppendSwitch(switches::kProcessPerTab); | 140 command_line.AppendSwitch(switches::kProcessPerTab); |
| 141 command_line.AppendSwitch(switches::kEnableLogging); | 141 command_line.AppendSwitch(switches::kEnableLogging); |
| 142 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); | 142 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); |
| 143 command_line.AppendSwitchASCII(switches::kUseGL, | 143 command_line.AppendSwitchASCII(switches::kUseGL, |
| 144 gfx::kGLImplementationOSMesaName); | 144 gfx::kGLImplementationOSMesaName); |
| 145 command_line.AppendSwitch(switches::kSkipGpuDataLoading); | 145 command_line.AppendSwitch(switches::kSkipGpuDataLoading); |
| 146 command_line.AppendSwitchASCII(switches::kTouchEvents, | 146 command_line.AppendSwitchASCII(switches::kTouchEvents, |
| 147 switches::kTouchEventsEnabled); | 147 switches::kTouchEventsEnabled); |
| 148 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); | 148 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); |
| 149 #if defined(OS_ANDROID) | |
| 150 command_line.AppendSwitch( | |
| 151 switches::kDisableGestureRequirementForMediaPlayback); | |
| 152 #endif | |
| 153 | 149 |
| 154 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { | 150 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { |
| 155 command_line.AppendSwitch( | 151 command_line.AppendSwitch( |
| 156 switches::kEnableExperimentalWebPlatformFeatures); | 152 switches::kEnableExperimentalWebPlatformFeatures); |
| 157 } | 153 } |
| 158 | 154 |
| 159 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) { | 155 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) { |
| 160 command_line.AppendSwitch(switches::kDisableThreadedCompositing); | 156 command_line.AppendSwitch(switches::kDisableThreadedCompositing); |
| 161 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); | 157 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); |
| 162 command_line.AppendSwitch(switches::kDisableImplSidePainting); | 158 command_line.AppendSwitch(switches::kDisableImplSidePainting); |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 browser_client_.reset(new ShellContentBrowserClient); | 294 browser_client_.reset(new ShellContentBrowserClient); |
| 299 return browser_client_.get(); | 295 return browser_client_.get(); |
| 300 } | 296 } |
| 301 | 297 |
| 302 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { | 298 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { |
| 303 renderer_client_.reset(new ShellContentRendererClient); | 299 renderer_client_.reset(new ShellContentRendererClient); |
| 304 return renderer_client_.get(); | 300 return renderer_client_.get(); |
| 305 } | 301 } |
| 306 | 302 |
| 307 } // namespace content | 303 } // namespace content |
| OLD | NEW |