Index: content/shell/browser/shell.cc |
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc |
index 5357b1f871239e10ae4226234bccf220905dc0c2..fa0183e2f03b4f9aa78f702ddd1e766f553a7c81 100644 |
--- a/content/shell/browser/shell.cc |
+++ b/content/shell/browser/shell.cc |
@@ -248,19 +248,14 @@ void Shell::UpdateNavigationControls(bool to_different_document) { |
} |
void Shell::ShowDevTools() { |
- InnerShowDevTools("", ""); |
+ InnerShowDevTools(); |
} |
void Shell::ShowDevToolsForElementAt(int x, int y) { |
- InnerShowDevTools("", ""); |
+ InnerShowDevTools(); |
devtools_frontend_->InspectElementAt(x, y); |
} |
-void Shell::ShowDevToolsForTest(const std::string& settings, |
- const std::string& frontend_url) { |
- InnerShowDevTools(settings, frontend_url); |
-} |
- |
void Shell::CloseDevTools() { |
if (!devtools_frontend_) |
return; |
@@ -418,16 +413,9 @@ void Shell::TitleWasSet(NavigationEntry* entry, bool explicit_set) { |
PlatformSetTitle(entry->GetTitle()); |
} |
-void Shell::InnerShowDevTools(const std::string& settings, |
- const std::string& frontend_url) { |
+void Shell::InnerShowDevTools() { |
if (!devtools_frontend_) { |
- if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kDumpRenderTree)) { |
- devtools_frontend_ = LayoutTestDevToolsFrontend::Show( |
- web_contents(), settings, frontend_url); |
- } else { |
- devtools_frontend_ = ShellDevToolsFrontend::Show(web_contents()); |
- } |
+ devtools_frontend_ = ShellDevToolsFrontend::Show(web_contents()); |
devtools_observer_.reset(new DevToolsWebContentsObserver( |
this, devtools_frontend_->frontend_shell()->web_contents())); |
} |