diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 00:17:41 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 00:17:41 +0000 |
| commit | b6dbb0a8ef1287f72c368ef3d64c8282bcafa511 (patch) | |
| tree | 89ed0ac38581202512b1b966d579cc0ebee59f94 /net/server/http_server.cc | |
| parent | 46f438d24ebaaad994920e548728bd1fc8ae039c (diff) | |
| download | chromium_src-b6dbb0a8ef1287f72c368ef3d64c8282bcafa511.zip chromium_src-b6dbb0a8ef1287f72c368ef3d64c8282bcafa511.tar.gz chromium_src-b6dbb0a8ef1287f72c368ef3d64c8282bcafa511.tar.bz2 | |
net: Put net/server/* into namespace net.
BUG=64263
TEST=None
R=willchan@chromium.org
Review URL: http://codereview.chromium.org/6875024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/server/http_server.cc')
| -rw-r--r-- | net/server/http_server.cc | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/net/server/http_server.cc b/net/server/http_server.cc index f4a228d..9c18490 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 |