summaryrefslogtreecommitdiffstats
path: root/net/server/http_server.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-09 16:16:30 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-09 16:16:30 +0000
commit7c17b699b935d33b20163b6da9169ef69d267885 (patch)
tree3bd6e67d918e4e0538cacb61e54c27c07374d306 /net/server/http_server.cc
parent9e52129b96738e19b584aa1356eb29d53ac58e74 (diff)
downloadchromium_src-7c17b699b935d33b20163b6da9169ef69d267885.zip
chromium_src-7c17b699b935d33b20163b6da9169ef69d267885.tar.gz
chromium_src-7c17b699b935d33b20163b6da9169ef69d267885.tar.bz2
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
Diffstat (limited to 'net/server/http_server.cc')
-rw-r--r--net/server/http_server.cc7
1 files changed, 5 insertions, 2 deletions
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);