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

Side by Side Diff: net/socket/socks_client_socket.h

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_SOCKET_SOCKS_CLIENT_SOCKET_H_ 5 #ifndef NET_SOCKET_SOCKS_CLIENT_SOCKET_H_
6 #define NET_SOCKET_SOCKS_CLIENT_SOCKET_H_ 6 #define NET_SOCKET_SOCKS_CLIENT_SOCKET_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/gtest_prod_util.h" 11 #include "base/gtest_prod_util.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "net/base/address_list.h" 14 #include "net/base/address_list.h"
15 #include "net/base/completion_callback.h" 15 #include "net/base/completion_callback.h"
16 #include "net/base/host_resolver.h"
17 #include "net/base/net_errors.h" 16 #include "net/base/net_errors.h"
18 #include "net/base/net_log.h" 17 #include "net/base/net_log.h"
19 #include "net/base/single_request_host_resolver.h" 18 #include "net/dns/host_resolver.h"
19 #include "net/dns/single_request_host_resolver.h"
20 #include "net/socket/stream_socket.h" 20 #include "net/socket/stream_socket.h"
21 21
22 namespace net { 22 namespace net {
23 23
24 class ClientSocketHandle; 24 class ClientSocketHandle;
25 class BoundNetLog; 25 class BoundNetLog;
26 26
27 // The SOCKS client socket implementation 27 // The SOCKS client socket implementation
28 class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket { 28 class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket {
29 public: 29 public:
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 HostResolver::RequestInfo host_request_info_; 135 HostResolver::RequestInfo host_request_info_;
136 136
137 BoundNetLog net_log_; 137 BoundNetLog net_log_;
138 138
139 DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocket); 139 DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocket);
140 }; 140 };
141 141
142 } // namespace net 142 } // namespace net
143 143
144 #endif // NET_SOCKET_SOCKS_CLIENT_SOCKET_H_ 144 #endif // NET_SOCKET_SOCKS_CLIENT_SOCKET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698