Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(272)

Side by Side Diff: content/shell/app/shell_main_delegate.cc

Issue 14940009: Rename the "Experimental WebKit Features" flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
116 command_line.AppendSwitch(switches::kProcessPerTab); 116 command_line.AppendSwitch(switches::kProcessPerTab);
117 command_line.AppendSwitch(switches::kEnableLogging); 117 command_line.AppendSwitch(switches::kEnableLogging);
118 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); 118 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles);
119 #if !defined(OS_ANDROID) 119 #if !defined(OS_ANDROID)
120 // OSMesa is not yet available for Android. http://crbug.com/248925 120 // OSMesa is not yet available for Android. http://crbug.com/248925
121 command_line.AppendSwitchASCII( 121 command_line.AppendSwitchASCII(
122 switches::kUseGL, gfx::kGLImplementationOSMesaName); 122 switches::kUseGL, gfx::kGLImplementationOSMesaName);
123 #endif 123 #endif
124 command_line.AppendSwitch(switches::kSkipGpuDataLoading); 124 command_line.AppendSwitch(switches::kSkipGpuDataLoading);
125 command_line.AppendSwitch(switches::kDisableGpuVsync); 125 command_line.AppendSwitch(switches::kDisableGpuVsync);
126 command_line.AppendSwitch(switches::kEnableExperimentalWebKitFeatures); 126 command_line.AppendSwitch(switches::kEnableExperimentalWebPlatformFeatures);
127 command_line.AppendSwitch(switches::kEnableCssShaders); 127 command_line.AppendSwitch(switches::kEnableCssShaders);
128 command_line.AppendSwitchASCII(switches::kTouchEvents, 128 command_line.AppendSwitchASCII(switches::kTouchEvents,
129 switches::kTouchEventsEnabled); 129 switches::kTouchEventsEnabled);
130 command_line.AppendSwitch(switches::kEnableGestureTapHighlight); 130 command_line.AppendSwitch(switches::kEnableGestureTapHighlight);
131 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); 131 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0");
132 #if defined(OS_ANDROID) 132 #if defined(OS_ANDROID)
133 // Capturing pixel results does not yet work when implementation-side 133 // Capturing pixel results does not yet work when implementation-side
134 // painting is enabled. See http://crbug.com/250777 134 // painting is enabled. See http://crbug.com/250777
135 command_line.AppendSwitch(cc::switches::kDisableImplSidePainting); 135 command_line.AppendSwitch(cc::switches::kDisableImplSidePainting);
136 #endif 136 #endif
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 browser_client_.reset(new ShellContentBrowserClient); 216 browser_client_.reset(new ShellContentBrowserClient);
217 return browser_client_.get(); 217 return browser_client_.get();
218 } 218 }
219 219
220 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 220 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
221 renderer_client_.reset(new ShellContentRendererClient); 221 renderer_client_.reset(new ShellContentRendererClient);
222 return renderer_client_.get(); 222 return renderer_client_.get();
223 } 223 }
224 224
225 } // namespace content 225 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698