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

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

Issue 8898036: base::Bind: Convert proxy_resolving_client_socket.[cc,h] and deps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Possible test fix. Created 9 years 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/socket_test_util.cc ('k') | net/socket/socks_client_socket_pool.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_POOL_H_ 5 #ifndef NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_
6 #define NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_ 6 #define NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 // Begins the transport connection and the SOCKS handshake. Returns OK on 91 // Begins the transport connection and the SOCKS handshake. Returns OK on
92 // success and ERR_IO_PENDING if it cannot immediately service the request. 92 // success and ERR_IO_PENDING if it cannot immediately service the request.
93 // Otherwise, it returns a net error code. 93 // Otherwise, it returns a net error code.
94 virtual int ConnectInternal() OVERRIDE; 94 virtual int ConnectInternal() OVERRIDE;
95 95
96 scoped_refptr<SOCKSSocketParams> socks_params_; 96 scoped_refptr<SOCKSSocketParams> socks_params_;
97 TransportClientSocketPool* const transport_pool_; 97 TransportClientSocketPool* const transport_pool_;
98 HostResolver* const resolver_; 98 HostResolver* const resolver_;
99 99
100 State next_state_; 100 State next_state_;
101 OldCompletionCallbackImpl<SOCKSConnectJob> callback_old_; 101 CompletionCallback callback_;
102 scoped_ptr<ClientSocketHandle> transport_socket_handle_; 102 scoped_ptr<ClientSocketHandle> transport_socket_handle_;
103 scoped_ptr<StreamSocket> socket_; 103 scoped_ptr<StreamSocket> socket_;
104 104
105 DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJob); 105 DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJob);
106 }; 106 };
107 107
108 class NET_EXPORT_PRIVATE SOCKSClientSocketPool 108 class NET_EXPORT_PRIVATE SOCKSClientSocketPool
109 : public ClientSocketPool, public LayeredPool { 109 : public ClientSocketPool, public LayeredPool {
110 public: 110 public:
111 SOCKSClientSocketPool( 111 SOCKSClientSocketPool(
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 PoolBase base_; 203 PoolBase base_;
204 204
205 DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocketPool); 205 DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocketPool);
206 }; 206 };
207 207
208 REGISTER_SOCKET_PARAMS_FOR_POOL(SOCKSClientSocketPool, SOCKSSocketParams); 208 REGISTER_SOCKET_PARAMS_FOR_POOL(SOCKSClientSocketPool, SOCKSSocketParams);
209 209
210 } // namespace net 210 } // namespace net
211 211
212 #endif // NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_ 212 #endif // NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_
OLDNEW
« no previous file with comments | « net/socket/socket_test_util.cc ('k') | net/socket/socks_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698