diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-01 14:54:21 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-01 14:54:21 +0000 |
commit | 464513520a7792134dd0fa5a939f99128d4890ba (patch) | |
tree | 6c8db80f83be5329b2d5c0db962d824a410e517d /net/socket/client_socket_pool_base.h | |
parent | c6d884ac6059305e721c2eedbf6ce95e5459bf86 (diff) | |
download | chromium_src-464513520a7792134dd0fa5a939f99128d4890ba.zip chromium_src-464513520a7792134dd0fa5a939f99128d4890ba.tar.gz chromium_src-464513520a7792134dd0fa5a939f99128d4890ba.tar.bz2 |
Make GetLoadState virtual in ConnectJob().
This will be necessary for SSLClientSocketPool since the SSLConnectJob will contain a ClientSocketHandle for the TCPClientSocketPool. SSLConnectJob::GetLoadState() will forward to ClientSocketHandle::GetLoadState() if the SSLConnectJob is waiting on requesting a TCP socket.
BUG=http://crbug.com/13289.
Review URL: http://codereview.chromium.org/176024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_pool_base.h')
-rw-r--r-- | net/socket/client_socket_pool_base.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h index 4b5a3b1..23c194c 100644 --- a/net/socket/client_socket_pool_base.h +++ b/net/socket/client_socket_pool_base.h @@ -70,8 +70,8 @@ class ConnectJob { // Accessors const std::string& group_name() const { return group_name_; } - LoadState load_state() const { return load_state_; } const ClientSocketHandle* key_handle() const { return key_handle_; } + LoadLog* load_log() { return load_log_; } // Releases |socket_| to the client. On connection error, this should return // NULL. @@ -85,10 +85,9 @@ class ConnectJob { // if it succeeded. int Connect(); - LoadLog* load_log() { return load_log_; } + virtual LoadState GetLoadState() const = 0; protected: - void set_load_state(LoadState load_state) { load_state_ = load_state; } void set_socket(ClientSocket* socket) { socket_.reset(socket); } ClientSocket* socket() { return socket_.get(); } void NotifyDelegateOfCompletion(int rv); @@ -106,7 +105,6 @@ class ConnectJob { // Timer to abort jobs that take too long. base::OneShotTimer<ConnectJob> timer_; Delegate* delegate_; - LoadState load_state_; scoped_ptr<ClientSocket> socket_; scoped_refptr<LoadLog> load_log_; |