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

Side by Side Diff: net/http/http_proxy_client_socket_pool.h

Issue 8824006: Migrate net/socket/socket.h, net/socket/stream_socket.h to base::Bind(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased 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/http/http_proxy_client_socket.cc ('k') | net/http/http_proxy_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_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_ 5 #ifndef NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_
6 #define NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_ 6 #define NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 // returned in this case, and must be release back to the pool; or 148 // returned in this case, and must be release back to the pool; or
149 // a standard net error code will be returned. 149 // a standard net error code will be returned.
150 virtual int ConnectInternal() OVERRIDE; 150 virtual int ConnectInternal() OVERRIDE;
151 151
152 scoped_refptr<HttpProxySocketParams> params_; 152 scoped_refptr<HttpProxySocketParams> params_;
153 TransportClientSocketPool* const transport_pool_; 153 TransportClientSocketPool* const transport_pool_;
154 SSLClientSocketPool* const ssl_pool_; 154 SSLClientSocketPool* const ssl_pool_;
155 HostResolver* const resolver_; 155 HostResolver* const resolver_;
156 156
157 State next_state_; 157 State next_state_;
158 OldCompletionCallbackImpl<HttpProxyConnectJob> callback_; 158 CompletionCallback callback_;
159 OldCompletionCallbackImpl<HttpProxyConnectJob> callback_old_;
159 scoped_ptr<ClientSocketHandle> transport_socket_handle_; 160 scoped_ptr<ClientSocketHandle> transport_socket_handle_;
160 scoped_ptr<ProxyClientSocket> transport_socket_; 161 scoped_ptr<ProxyClientSocket> transport_socket_;
161 bool using_spdy_; 162 bool using_spdy_;
162 163
163 HttpResponseInfo error_response_info_; 164 HttpResponseInfo error_response_info_;
164 165
165 scoped_refptr<SpdyStream> spdy_stream_; 166 scoped_refptr<SpdyStream> spdy_stream_;
166 167
167 DISALLOW_COPY_AND_ASSIGN(HttpProxyConnectJob); 168 DISALLOW_COPY_AND_ASSIGN(HttpProxyConnectJob);
168 }; 169 };
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 270
270 DISALLOW_COPY_AND_ASSIGN(HttpProxyClientSocketPool); 271 DISALLOW_COPY_AND_ASSIGN(HttpProxyClientSocketPool);
271 }; 272 };
272 273
273 REGISTER_SOCKET_PARAMS_FOR_POOL(HttpProxyClientSocketPool, 274 REGISTER_SOCKET_PARAMS_FOR_POOL(HttpProxyClientSocketPool,
274 HttpProxySocketParams); 275 HttpProxySocketParams);
275 276
276 } // namespace net 277 } // namespace net
277 278
278 #endif // NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_ 279 #endif // NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_
OLDNEW
« no previous file with comments | « net/http/http_proxy_client_socket.cc ('k') | net/http/http_proxy_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698