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

Unified Diff: content/browser/debugger/devtools_http_handler_impl.cc

Issue 10837177: Add a menu item to content_shell to open devtools to make it more discoverable. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix android compile, and add gtk support Created 8 years, 4 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/browser/debugger/devtools_http_handler_impl.cc
===================================================================
--- content/browser/debugger/devtools_http_handler_impl.cc (revision 150609)
+++ content/browser/debugger/devtools_http_handler_impl.cc (working copy)
@@ -167,6 +167,17 @@
binding_ = default_binding_.get();
}
+GURL DevToolsHttpHandlerImpl::GetFrontendURL(RenderViewHost* render_view_host) {
+ net::IPEndPoint ip_address;
+ if (server_->GetLocalAddress(&ip_address))
+ return GURL();
+ std::string host = ip_address.ToString();
+ std::string id = binding_->GetIdentifier(render_view_host);
+ return GURL(std::string("http://") +
+ ip_address.ToString() +
+ GetFrontendURLInternal(id, host));
+}
+
static std::string PathWithoutParams(const std::string& path) {
size_t query_position = path.find("?");
if (query_position != std::string::npos)
@@ -377,6 +388,17 @@
return page_list;
}
+std::string DevToolsHttpHandlerImpl::GetFrontendURLInternal(
+ const std::string rvh_id,
+ const std::string& host) {
+ return base::StringPrintf(
+ "%s%sws=%s/devtools/page/%s",
+ overridden_frontend_url_.c_str(),
+ overridden_frontend_url_.find("?") == std::string::npos ? "?" : "&",
+ host.c_str(),
+ rvh_id.c_str());
+}
+
void DevToolsHttpHandlerImpl::OnJsonRequestUI(
int connection_id,
const net::HttpServerRequestInfo& info) {
@@ -396,12 +418,8 @@
base::StringPrintf("ws://%s/devtools/page/%s",
host.c_str(),
i->id.c_str()));
- std::string devtools_frontend_url = base::StringPrintf(
- "%s%sws=%s/devtools/page/%s",
- overridden_frontend_url_.c_str(),
- overridden_frontend_url_.find("?") == std::string::npos ? "?" : "&",
- host.c_str(),
- i->id.c_str());
+ std::string devtools_frontend_url = GetFrontendURLInternal(i->id.c_str(),
+ host);
page_info->SetString("devtoolsFrontendUrl", devtools_frontend_url);
}
}

Powered by Google App Engine
This is Rietveld 408576698