From 7c17b699b935d33b20163b6da9169ef69d267885 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Thu, 9 Aug 2012 16:16:30 +0000 Subject: Add a menu item to content_shell to open devtools to make it more discoverable. Since the devtools server is running for each content shell browser process, the user doesn't specify a server port anymore. Instead I let the system pick. This made it necessary to plumb the data back from net::HttpServer. For now I only added Windows and Linux UI. Mac UI will be done later. BUG=90445 Review URL: https://chromiumcodereview.appspot.com/10837177 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150808 0039d316-1c4b-4281-b951-d872f2087c98 --- net/server/http_server.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'net/server/http_server.cc') diff --git a/net/server/http_server.cc b/net/server/http_server.cc index 2e12d17..9582487 100644 --- a/net/server/http_server.cc +++ b/net/server/http_server.cc @@ -83,8 +83,7 @@ void HttpServer::Send500(int connection_id, const std::string& message) { connection->Send500(message); } -void HttpServer::Close(int connection_id) -{ +void HttpServer::Close(int connection_id) { HttpConnection* connection = FindConnection(connection_id); if (connection == NULL) return; @@ -94,6 +93,10 @@ void HttpServer::Close(int connection_id) DidClose(connection->socket_); } +int HttpServer::GetLocalAddress(IPEndPoint* address) { + return server_->GetLocalAddress(address); +} + void HttpServer::DidAccept(StreamListenSocket* server, StreamListenSocket* socket) { HttpConnection* connection = new HttpConnection(this, socket); -- cgit v1.1