summaryrefslogtreecommitdiffstats
path: root/content/browser/devtools/devtools_http_handler_impl.cc
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-25 15:57:57 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-25 15:57:57 +0000
commit0773e0c78348c867dd45a6d128fd74842e4b17f4 (patch)
tree79220b296a9e1caa4156319ca56c4d52aa3bf2e4 /content/browser/devtools/devtools_http_handler_impl.cc
parentc97cc0e609284ac6d07d828962fdff9cddbf1d67 (diff)
downloadchromium_src-0773e0c78348c867dd45a6d128fd74842e4b17f4.zip
chromium_src-0773e0c78348c867dd45a6d128fd74842e4b17f4.tar.gz
chromium_src-0773e0c78348c867dd45a6d128fd74842e4b17f4.tar.bz2
Shell: use IPC-based DevTools front-end in content shell instead of remote debugging one.
BUG=171920 Review URL: https://chromiumcodereview.appspot.com/12042102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/devtools/devtools_http_handler_impl.cc')
-rw-r--r--content/browser/devtools/devtools_http_handler_impl.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc
index 6555345..e14d683 100644
--- a/content/browser/devtools/devtools_http_handler_impl.cc
+++ b/content/browser/devtools/devtools_http_handler_impl.cc
@@ -242,6 +242,10 @@ GURL DevToolsHttpHandlerImpl::GetFrontendURL(DevToolsAgentHost* agent_host) {
net::IPEndPoint ip_address;
if (server_->GetLocalAddress(&ip_address))
return GURL();
+ if (!agent_host) {
+ return GURL(std::string("http://") + ip_address.ToString() +
+ overridden_frontend_url_);
+ }
std::string host = ip_address.ToString();
std::string id = binding_->GetIdentifier(agent_host);
return GURL(std::string("http://") +