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

Unified Diff: content/shell/browser/shell.cc

Issue 644723002: Content Shell: Introduce LayoutTestDevToolsFrontend. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
Index: content/shell/browser/shell.cc
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc
index 431c2154d1ef870047c6545d004f347e7e4f3308..82e8fe6aa588305bebe5aeec0b2d47c9f843bdbf 100644
--- a/content/shell/browser/shell.cc
+++ b/content/shell/browser/shell.cc
@@ -19,6 +19,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/common/renderer_preferences.h"
+#include "content/shell/browser/layout_test/layout_test_devtools_frontend.h"
#include "content/shell/browser/layout_test/layout_test_javascript_dialog_manager.h"
#include "content/shell/browser/notify_done_forwarder.h"
#include "content/shell/browser/shell_browser_main_parts.h"
@@ -385,8 +386,13 @@ void Shell::TitleWasSet(NavigationEntry* entry, bool explicit_set) {
void Shell::InnerShowDevTools(const std::string& settings,
const std::string& frontend_url) {
if (!devtools_frontend_) {
- devtools_frontend_ = ShellDevToolsFrontend::Show(
- web_contents(), settings, frontend_url);
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDumpRenderTree)) {
+ devtools_frontend_ = LayoutTestDevToolsFrontend::Show(
+ web_contents(), settings, frontend_url);
+ } else {
+ devtools_frontend_ = ShellDevToolsFrontend::Show(web_contents());
+ }
devtools_observer_.reset(new DevToolsWebContentsObserver(
this, devtools_frontend_->frontend_shell()->web_contents()));
}
« no previous file with comments | « content/shell/browser/layout_test/layout_test_devtools_frontend.cc ('k') | content/shell/browser/shell_devtools_frontend.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698