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

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

Issue 11362161: Use the WebTestProxy for layout tests in content_shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 8 years, 1 month 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/file_path.h" 8 #include "base/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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 InitLogging(); 99 InitLogging();
100 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { 100 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
101 CommandLine::ForCurrentProcess()->AppendSwitch( 101 CommandLine::ForCurrentProcess()->AppendSwitch(
102 switches::kAllowFileAccessFromFiles); 102 switches::kAllowFileAccessFromFiles);
103 CommandLine::ForCurrentProcess()->AppendSwitch( 103 CommandLine::ForCurrentProcess()->AppendSwitch(
104 switches::kForceCompositingMode); 104 switches::kForceCompositingMode);
105 CommandLine::ForCurrentProcess()->AppendSwitchASCII( 105 CommandLine::ForCurrentProcess()->AppendSwitchASCII(
106 switches::kUseGL, gfx::kGLImplementationOSMesaName); 106 switches::kUseGL, gfx::kGLImplementationOSMesaName);
107 CommandLine::ForCurrentProcess()->AppendSwitch( 107 CommandLine::ForCurrentProcess()->AppendSwitch(
108 switches::kIgnoreGpuBlacklist); 108 switches::kIgnoreGpuBlacklist);
109 CommandLine::ForCurrentProcess()->AppendSwitch(
110 switches::kForceRendererAccessibility);
109 net::CookieMonster::EnableFileScheme(); 111 net::CookieMonster::EnableFileScheme();
110 if (!WebKitTestPlatformInitialize()) { 112 if (!WebKitTestPlatformInitialize()) {
111 if (exit_code) 113 if (exit_code)
112 *exit_code = 1; 114 *exit_code = 1;
113 return true; 115 return true;
114 } 116 }
115 } 117 }
116 SetContentClient(&content_client_); 118 SetContentClient(&content_client_);
117 return false; 119 return false;
118 } 120 }
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 browser_client_.reset(new ShellContentBrowserClient); 184 browser_client_.reset(new ShellContentBrowserClient);
183 return browser_client_.get(); 185 return browser_client_.get();
184 } 186 }
185 187
186 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 188 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
187 renderer_client_.reset(new ShellContentRendererClient); 189 renderer_client_.reset(new ShellContentRendererClient);
188 return renderer_client_.get(); 190 return renderer_client_.get();
189 } 191 }
190 192
191 } // namespace content 193 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_content_renderer_client.cc ('k') | content/shell/shell_render_process_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698