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

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

Issue 1370953002: content: Remove dump-render-tree switch. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
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/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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 114
115 ShellMainDelegate::ShellMainDelegate() { 115 ShellMainDelegate::ShellMainDelegate() {
116 } 116 }
117 117
118 ShellMainDelegate::~ShellMainDelegate() { 118 ShellMainDelegate::~ShellMainDelegate() {
119 } 119 }
120 120
121 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { 121 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
122 base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); 122 base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
123 123
124 // "dump-render-tree" has been renamed to "run-layout-test", but the old
125 // flag name is still used in some places, so this check will remain until
126 // it is phased out entirely.
127 if (command_line.HasSwitch(switches::kDumpRenderTree))
128 command_line.AppendSwitch(switches::kRunLayoutTest);
129
130 #if defined(OS_WIN) 124 #if defined(OS_WIN)
131 // Enable trace control and transport through event tracing for Windows. 125 // Enable trace control and transport through event tracing for Windows.
132 logging::LogEventProvider::Initialize(kContentShellProviderName); 126 logging::LogEventProvider::Initialize(kContentShellProviderName);
133 127
134 v8_breakpad_support::SetUp(); 128 v8_breakpad_support::SetUp();
135 #endif 129 #endif
136 #if defined(OS_MACOSX) 130 #if defined(OS_MACOSX)
137 // Needs to happen before InitializeResourceBundle() and before 131 // Needs to happen before InitializeResourceBundle() and before
138 // BlinkTestPlatformInitialize() are called. 132 // BlinkTestPlatformInitialize() are called.
139 OverrideFrameworkBundlePath(); 133 OverrideFrameworkBundlePath();
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 345
352 return renderer_client_.get(); 346 return renderer_client_.get();
353 } 347 }
354 348
355 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { 349 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() {
356 utility_client_.reset(new ShellContentUtilityClient); 350 utility_client_.reset(new ShellContentUtilityClient);
357 return utility_client_.get(); 351 return utility_client_.get();
358 } 352 }
359 353
360 } // namespace content 354 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698