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/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 EnableBrowserLayoutTestMode(); | 116 EnableBrowserLayoutTestMode(); |
117 | 117 |
118 command_line.AppendSwitch(switches::kProcessPerTab); | 118 command_line.AppendSwitch(switches::kProcessPerTab); |
119 command_line.AppendSwitch(switches::kEnableLogging); | 119 command_line.AppendSwitch(switches::kEnableLogging); |
120 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); | 120 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); |
121 #if !defined(OS_ANDROID) | 121 #if !defined(OS_ANDROID) |
122 // OSMesa is not yet available for Android. http://crbug.com/248925 | 122 // OSMesa is not yet available for Android. http://crbug.com/248925 |
123 command_line.AppendSwitchASCII( | 123 command_line.AppendSwitchASCII( |
124 switches::kUseGL, gfx::kGLImplementationOSMesaName); | 124 switches::kUseGL, gfx::kGLImplementationOSMesaName); |
125 #endif | 125 #endif |
126 command_line.AppendSwitch(switches::kSkipGpuDataLoading); | |
127 command_line.AppendSwitch(switches::kDisableGpuVsync); | 126 command_line.AppendSwitch(switches::kDisableGpuVsync); |
128 command_line.AppendSwitchASCII(switches::kTouchEvents, | 127 command_line.AppendSwitchASCII(switches::kTouchEvents, |
129 switches::kTouchEventsEnabled); | 128 switches::kTouchEventsEnabled); |
130 command_line.AppendSwitch(switches::kEnableGestureTapHighlight); | 129 command_line.AppendSwitch(switches::kEnableGestureTapHighlight); |
131 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); | 130 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); |
132 #if defined(OS_ANDROID) | 131 #if defined(OS_ANDROID) |
133 command_line.AppendSwitch( | 132 command_line.AppendSwitch( |
134 switches::kDisableGestureRequirementForMediaPlayback); | 133 switches::kDisableGestureRequirementForMediaPlayback); |
135 // Capturing pixel results does not yet work when implementation-side | 134 // Capturing pixel results does not yet work when implementation-side |
136 // painting is enabled. See http://crbug.com/250777 | 135 // painting is enabled. See http://crbug.com/250777 |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 browser_client_.reset(new ShellContentBrowserClient); | 224 browser_client_.reset(new ShellContentBrowserClient); |
226 return browser_client_.get(); | 225 return browser_client_.get(); |
227 } | 226 } |
228 | 227 |
229 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { | 228 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { |
230 renderer_client_.reset(new ShellContentRendererClient); | 229 renderer_client_.reset(new ShellContentRendererClient); |
231 return renderer_client_.get(); | 230 return renderer_client_.get(); |
232 } | 231 } |
233 | 232 |
234 } // namespace content | 233 } // namespace content |
OLD | NEW |