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

Side by Side Diff: net/socket/ssl_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/socket/ssl_client_socket_openssl.cc ('k') | net/socket/ssl_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_SSL_CLIENT_SOCKET_POOL_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 scoped_refptr<SSLSocketParams> params_; 145 scoped_refptr<SSLSocketParams> params_;
146 TransportClientSocketPool* const transport_pool_; 146 TransportClientSocketPool* const transport_pool_;
147 SOCKSClientSocketPool* const socks_pool_; 147 SOCKSClientSocketPool* const socks_pool_;
148 HttpProxyClientSocketPool* const http_proxy_pool_; 148 HttpProxyClientSocketPool* const http_proxy_pool_;
149 ClientSocketFactory* const client_socket_factory_; 149 ClientSocketFactory* const client_socket_factory_;
150 HostResolver* const host_resolver_; 150 HostResolver* const host_resolver_;
151 151
152 const SSLClientSocketContext context_; 152 const SSLClientSocketContext context_;
153 153
154 State next_state_; 154 State next_state_;
155 OldCompletionCallbackImpl<SSLConnectJob> callback_; 155 CompletionCallback callback_;
156 OldCompletionCallbackImpl<SSLConnectJob> callback_old_;
156 scoped_ptr<ClientSocketHandle> transport_socket_handle_; 157 scoped_ptr<ClientSocketHandle> transport_socket_handle_;
157 scoped_ptr<SSLClientSocket> ssl_socket_; 158 scoped_ptr<SSLClientSocket> ssl_socket_;
158 scoped_ptr<SSLHostInfo> ssl_host_info_; 159 scoped_ptr<SSLHostInfo> ssl_host_info_;
159 160
160 // The time the DoSSLConnect() method was called. 161 // The time the DoSSLConnect() method was called.
161 base::TimeTicks ssl_connect_start_time_; 162 base::TimeTicks ssl_connect_start_time_;
162 163
163 HttpResponseInfo error_response_info_; 164 HttpResponseInfo error_response_info_;
164 165
165 DISALLOW_COPY_AND_ASSIGN(SSLConnectJob); 166 DISALLOW_COPY_AND_ASSIGN(SSLConnectJob);
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 const scoped_refptr<SSLConfigService> ssl_config_service_; 295 const scoped_refptr<SSLConfigService> ssl_config_service_;
295 296
296 DISALLOW_COPY_AND_ASSIGN(SSLClientSocketPool); 297 DISALLOW_COPY_AND_ASSIGN(SSLClientSocketPool);
297 }; 298 };
298 299
299 REGISTER_SOCKET_PARAMS_FOR_POOL(SSLClientSocketPool, SSLSocketParams); 300 REGISTER_SOCKET_PARAMS_FOR_POOL(SSLClientSocketPool, SSLSocketParams);
300 301
301 } // namespace net 302 } // namespace net
302 303
303 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_ 304 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/socket/ssl_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698