| Index: net/socket/ssl_client_socket_pool.h
|
| ===================================================================
|
| --- net/socket/ssl_client_socket_pool.h (revision 54615)
|
| +++ net/socket/ssl_client_socket_pool.h (working copy)
|
| @@ -44,7 +44,7 @@
|
| bool want_spdy_over_npn);
|
|
|
| const scoped_refptr<TCPSocketParams>& tcp_params() { return tcp_params_; }
|
| - const scoped_refptr<HttpProxySocketParams>& http_proxy_params() {
|
| + const scoped_refptr<HttpProxySocketParams>& http_proxy_params () {
|
| return http_proxy_params_;
|
| }
|
| const scoped_refptr<SOCKSSocketParams>& socks_params() {
|
| @@ -114,6 +114,8 @@
|
| // Otherwise, it returns a net error code.
|
| virtual int ConnectInternal();
|
|
|
| + void DetermineFirstState();
|
| +
|
| void OnIOComplete(int result);
|
|
|
| // Runs the state transition loop.
|
|
|
| Property changes on: net\socket\ssl_client_socket_pool.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|