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

Unified Diff: net/server/http_server.cc

Issue 6875024: net: Put net/server/* into namespace net. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: willchan review Created 9 years, 8 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
« no previous file with comments | « net/server/http_server.h ('k') | net/server/http_server_request_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/server/http_server.cc
diff --git a/net/server/http_server.cc b/net/server/http_server.cc
index f4a228d701ea8c69a44a309fb95820261352579b..9c1849009a37951ab050933f62dc945d5f6e2768 100644
--- a/net/server/http_server.cc
+++ b/net/server/http_server.cc
@@ -1,14 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <map>
-
-#ifdef _WIN32
-#include <winsock2.h>
-#else
-#include <arpa/inet.h>
-#endif
+#include "net/server/http_server.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
@@ -16,10 +10,19 @@
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "net/server/http_server.h"
+#include "build/build_config.h"
#include "net/server/http_server_request_info.h"
+#if defined(OS_WIN)
+#include <winsock2.h>
+#else
+#include <arpa/inet.h>
+#endif
+
+namespace net {
+
int HttpServer::Connection::lastId_ = 0;
+
HttpServer::HttpServer(const std::string& host,
int port,
HttpServer::Delegate* del)
@@ -433,3 +436,5 @@ HttpServer::Connection* HttpServer::FindConnection(ListenSocket* socket) {
return NULL;
return it->second;
}
+
+} // namespace net
« no previous file with comments | « net/server/http_server.h ('k') | net/server/http_server_request_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698