diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 23:18:21 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 23:18:21 +0000 |
| commit | 0e6f619c41f85776a963a2bfb587ad64675554c4 (patch) | |
| tree | dff81415834875ce943e6e4af882d676497d971b /net/server/web_socket.cc | |
| parent | dfa08b04cf8ee5a34972379f254061647313e2f0 (diff) | |
| download | chromium_src-0e6f619c41f85776a963a2bfb587ad64675554c4.zip chromium_src-0e6f619c41f85776a963a2bfb587ad64675554c4.tar.gz chromium_src-0e6f619c41f85776a963a2bfb587ad64675554c4.tar.bz2 | |
Move net/base/sys_byteorder.h to base/sys_byteorder.h
Two motivations:
(1) There are currently clients in src/crypto that need the same logic.
(2) There is soon to be a client in src/chrome/common that needs the 64-bit version of this logic, which is currently inlined in a src/crypto implementation file.
BUG=103480
TEST=compiles
Review URL: http://codereview.chromium.org/8949026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/server/web_socket.cc')
| -rw-r--r-- | net/server/web_socket.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/server/web_socket.cc b/net/server/web_socket.cc index 7360c25..0abbcf7 100644 --- a/net/server/web_socket.cc +++ b/net/server/web_socket.cc @@ -4,6 +4,8 @@ #include "net/server/web_socket.h" +#include <limits> + #include "base/base64.h" #include "base/rand_util.h" #include "base/logging.h" @@ -11,17 +13,10 @@ #include "base/sha1.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/sys_byteorder.h" #include "net/server/http_connection.h" #include "net/server/http_server_request_info.h" -#if defined(OS_WIN) -#include <winsock2.h> -#else -#include <arpa/inet.h> -#endif - -#include <limits> - namespace net { namespace { |