Chromium Code Reviews| Index: content/shell/app/shell_main_delegate.cc |
| diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc |
| index b0fbabb2c3508f187617bbac907e5ace8ab5c1be..f682ba79328b95920729763fa0860010b5bb3dfb 100644 |
| --- a/content/shell/app/shell_main_delegate.cc |
| +++ b/content/shell/app/shell_main_delegate.cc |
| @@ -19,6 +19,7 @@ |
| #include "content/public/test/layouttest_support.h" |
| #include "content/shell/app/shell_crash_reporter_client.h" |
| #include "content/shell/app/webkit_test_platform_support.h" |
| +#include "content/shell/browser/layout_test/layout_test_browser_main.h" |
| #include "content/shell/browser/shell_browser_main.h" |
| #include "content/shell/browser/shell_content_browser_client.h" |
| #include "content/shell/common/shell_switches.h" |
| @@ -251,7 +252,10 @@ int ShellMainDelegate::RunProcess( |
| #endif |
| browser_runner_.reset(BrowserMainRunner::Create()); |
| - return ShellBrowserMain(main_function_params, browser_runner_); |
| + CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
| + return command_line.HasSwitch(switches::kDumpRenderTree) |
| + ? LayoutTestBrowserMain(main_function_params, browser_runner_) |
| + : ShellBrowserMain(main_function_params, browser_runner_); |
|
jochen (gone - plz use gerrit)
2014/10/14 14:52:24
can the else part be inlined? the ShellBrowserMain
|
| } |
| #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) |