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

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

Issue 14940009: Rename the "Experimental WebKit Features" flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Missed one. Created 7 years, 7 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
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/shell_main_delegate.h" 5 #include "content/shell/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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 InitLogging(); 104 InitLogging();
105 CommandLine& command_line = *CommandLine::ForCurrentProcess(); 105 CommandLine& command_line = *CommandLine::ForCurrentProcess();
106 if (command_line.HasSwitch(switches::kDumpRenderTree)) { 106 if (command_line.HasSwitch(switches::kDumpRenderTree)) {
107 command_line.AppendSwitch(switches::kProcessPerTab); 107 command_line.AppendSwitch(switches::kProcessPerTab);
108 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); 108 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles);
109 command_line.AppendSwitchASCII( 109 command_line.AppendSwitchASCII(
110 switches::kUseGL, gfx::kGLImplementationOSMesaName); 110 switches::kUseGL, gfx::kGLImplementationOSMesaName);
111 SetAllowOSMesaImageTransportForTesting(); 111 SetAllowOSMesaImageTransportForTesting();
112 DisableSystemDragDrop(); 112 DisableSystemDragDrop();
113 command_line.AppendSwitch(switches::kSkipGpuDataLoading); 113 command_line.AppendSwitch(switches::kSkipGpuDataLoading);
114 command_line.AppendSwitch(switches::kEnableExperimentalWebKitFeatures); 114 command_line.AppendSwitch(switches::kEnableExperimentalWebPlatformFeatures);
115 command_line.AppendSwitch(switches::kEnableCssShaders); 115 command_line.AppendSwitch(switches::kEnableCssShaders);
116 command_line.AppendSwitchASCII(switches::kTouchEvents, 116 command_line.AppendSwitchASCII(switches::kTouchEvents,
117 switches::kTouchEventsEnabled); 117 switches::kTouchEventsEnabled);
118 if (command_line.HasSwitch(switches::kEnableSoftwareCompositing)) 118 if (command_line.HasSwitch(switches::kEnableSoftwareCompositing))
119 command_line.AppendSwitch(switches::kEnableSoftwareCompositingGLAdapter); 119 command_line.AppendSwitch(switches::kEnableSoftwareCompositingGLAdapter);
120 120
121 net::CookieMonster::EnableFileScheme(); 121 net::CookieMonster::EnableFileScheme();
122 if (!WebKitTestPlatformInitialize()) { 122 if (!WebKitTestPlatformInitialize()) {
123 if (exit_code) 123 if (exit_code)
124 *exit_code = 1; 124 *exit_code = 1;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 browser_client_.reset(new ShellContentBrowserClient); 190 browser_client_.reset(new ShellContentBrowserClient);
191 return browser_client_.get(); 191 return browser_client_.get();
192 } 192 }
193 193
194 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 194 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
195 renderer_client_.reset(new ShellContentRendererClient); 195 renderer_client_.reset(new ShellContentRendererClient);
196 return renderer_client_.get(); 196 return renderer_client_.get();
197 } 197 }
198 198
199 } // namespace content 199 } // namespace content
OLDNEW
« content/public/common/content_switches.cc ('K') | « content/renderer/render_thread_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698