diff options
Diffstat (limited to 'content/shell/browser/shell.cc')
-rw-r--r-- | content/shell/browser/shell.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc index 546e5e3..bdd44fd 100644 --- a/content/shell/browser/shell.cc +++ b/content/shell/browser/shell.cc @@ -86,7 +86,7 @@ Shell::Shell(WebContents* web_contents) headless_(false) { const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); - if (command_line.HasSwitch(switches::kDumpRenderTree)) + if (command_line.HasSwitch(switches::kRunLayoutTest)) headless_ = true; windows_.push_back(this); @@ -127,7 +127,7 @@ Shell* Shell::CreateShell(WebContents* web_contents, shell->PlatformResizeSubViews(); if (base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDumpRenderTree)) { + switches::kRunLayoutTest)) { web_contents->GetMutableRendererPrefs()->use_custom_colors = false; web_contents->GetRenderViewHost()->SyncRendererPrefs(); } @@ -218,7 +218,7 @@ void Shell::AddNewContents(WebContents* source, bool* was_blocked) { CreateShell(new_contents, AdjustWindowSize(initial_rect.size())); if (base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDumpRenderTree)) + switches::kRunLayoutTest)) NotifyDoneForwarder::CreateForWebContents(new_contents); } @@ -317,7 +317,7 @@ void Shell::ToggleFullscreenModeForTab(WebContents* web_contents, PlatformToggleFullscreenModeForTab(web_contents, enter_fullscreen); #endif if (!base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDumpRenderTree)) + switches::kRunLayoutTest)) return; if (is_fullscreen_ != enter_fullscreen) { is_fullscreen_ = enter_fullscreen; @@ -360,7 +360,7 @@ JavaScriptDialogManager* Shell::GetJavaScriptDialogManager( if (!dialog_manager_) { const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); - dialog_manager_.reset(command_line.HasSwitch(switches::kDumpRenderTree) + dialog_manager_.reset(command_line.HasSwitch(switches::kRunLayoutTest) ? new LayoutTestJavaScriptDialogManager : new ShellJavaScriptDialogManager); } @@ -373,12 +373,12 @@ bool Shell::AddMessageToConsole(WebContents* source, int32 line_no, const base::string16& source_id) { return base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDumpRenderTree); + switches::kRunLayoutTest); } void Shell::RendererUnresponsive(WebContents* source) { if (!base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDumpRenderTree)) + switches::kRunLayoutTest)) return; WebKitTestController::Get()->RendererUnresponsive(); } @@ -393,7 +393,7 @@ void Shell::DeactivateContents(WebContents* contents) { void Shell::WorkerCrashed(WebContents* source) { if (!base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDumpRenderTree)) + switches::kRunLayoutTest)) return; WebKitTestController::Get()->WorkerCrashed(); } |