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

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

Issue 22794008: Remove deprecated functions that take StreamSockets instead of handles (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Android for reals Created 7 years, 4 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
« no previous file with comments | « net/socket/socks5_client_socket_unittest.cc ('k') | net/socket/socks_client_socket.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 18 matching lines...) Expand all
29 public: 29 public:
30 // Takes ownership of the |transport_socket|, which should already be 30 // Takes ownership of the |transport_socket|, which should already be
31 // connected by the time Connect() is called. 31 // connected by the time Connect() is called.
32 // 32 //
33 // |req_info| contains the hostname and port to which the socket above will 33 // |req_info| contains the hostname and port to which the socket above will
34 // communicate to via the socks layer. For testing the referrer is optional. 34 // communicate to via the socks layer. For testing the referrer is optional.
35 SOCKSClientSocket(ClientSocketHandle* transport_socket, 35 SOCKSClientSocket(ClientSocketHandle* transport_socket,
36 const HostResolver::RequestInfo& req_info, 36 const HostResolver::RequestInfo& req_info,
37 HostResolver* host_resolver); 37 HostResolver* host_resolver);
38 38
39 // Deprecated constructor (http://crbug.com/37810) that takes a StreamSocket.
40 SOCKSClientSocket(StreamSocket* transport_socket,
41 const HostResolver::RequestInfo& req_info,
42 HostResolver* host_resolver);
43
44 // On destruction Disconnect() is called. 39 // On destruction Disconnect() is called.
45 virtual ~SOCKSClientSocket(); 40 virtual ~SOCKSClientSocket();
46 41
47 // StreamSocket implementation. 42 // StreamSocket implementation.
48 43
49 // Does the SOCKS handshake and completes the protocol. 44 // Does the SOCKS handshake and completes the protocol.
50 virtual int Connect(const CompletionCallback& callback) OVERRIDE; 45 virtual int Connect(const CompletionCallback& callback) OVERRIDE;
51 virtual void Disconnect() OVERRIDE; 46 virtual void Disconnect() OVERRIDE;
52 virtual bool IsConnected() const OVERRIDE; 47 virtual bool IsConnected() const OVERRIDE;
53 virtual bool IsConnectedAndIdle() const OVERRIDE; 48 virtual bool IsConnectedAndIdle() const OVERRIDE;
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 HostResolver::RequestInfo host_request_info_; 128 HostResolver::RequestInfo host_request_info_;
134 129
135 BoundNetLog net_log_; 130 BoundNetLog net_log_;
136 131
137 DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocket); 132 DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocket);
138 }; 133 };
139 134
140 } // namespace net 135 } // namespace net
141 136
142 #endif // NET_SOCKET_SOCKS_CLIENT_SOCKET_H_ 137 #endif // NET_SOCKET_SOCKS_CLIENT_SOCKET_H_
OLDNEW
« no previous file with comments | « net/socket/socks5_client_socket_unittest.cc ('k') | net/socket/socks_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698