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