diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-31 20:30:28 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:31:41 -0700 |
| commit | 72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 (patch) | |
| tree | 382278a54ce7a744d62fa510a9a80688cc12434b /net/socket/socks_client_socket_pool.h | |
| parent | c4becdd46e31d261b930e4b5a539cbc1d45c23a6 (diff) | |
| download | external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.zip external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.gz external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.bz2 | |
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
Diffstat (limited to 'net/socket/socks_client_socket_pool.h')
| -rw-r--r-- | net/socket/socks_client_socket_pool.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/socket/socks_client_socket_pool.h b/net/socket/socks_client_socket_pool.h index fd19820..47637ef 100644 --- a/net/socket/socks_client_socket_pool.h +++ b/net/socket/socks_client_socket_pool.h @@ -81,11 +81,6 @@ class SOCKSConnectJob : public ConnectJob { STATE_NONE, }; - // Begins the tcp connection and the SOCKS handshake. Returns OK on success - // and ERR_IO_PENDING if it cannot immediately service the request. - // Otherwise, it returns a net error code. - virtual int ConnectInternal(); - void OnIOComplete(int result); // Runs the state transition loop. @@ -96,6 +91,11 @@ class SOCKSConnectJob : public ConnectJob { int DoSOCKSConnect(); int DoSOCKSConnectComplete(int result); + // Begins the tcp connection and the SOCKS handshake. Returns OK on success + // and ERR_IO_PENDING if it cannot immediately service the request. + // Otherwise, it returns a net error code. + virtual int ConnectInternal(); + scoped_refptr<SOCKSSocketParams> socks_params_; TCPClientSocketPool* const tcp_pool_; HostResolver* const resolver_; |