diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 20:38:10 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 20:38:10 +0000 |
commit | f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8 (patch) | |
tree | 6ccdd87ccfc89adbcb372c517559fa61fbc6c6b2 /net/socket/ssl_client_socket_openssl.h | |
parent | d1666539b57bf8552e203d355fd09909d36f9732 (diff) | |
download | chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.zip chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.gz chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.bz2 |
Begin CompletionCallback switchover.
Rename CompletionCallback to OldCompletionCallback in preparation for introducing a new CompletionCallback based on base::Callback.
Also renames other CompletionCallback types like CancelableCompletionCallback and TestCompletionCallback and CompletionCallbackImpl. All using sed with s/CompletionCallback/OldCompletionCallback/g.
BUG=98719
TEST=none
Review URL: http://codereview.chromium.org/8070013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_openssl.h')
-rw-r--r-- | net/socket/ssl_client_socket_openssl.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h index e3529a4..81ece4c 100644 --- a/net/socket/ssl_client_socket_openssl.h +++ b/net/socket/ssl_client_socket_openssl.h @@ -62,7 +62,7 @@ class SSLClientSocketOpenSSL : public SSLClientSocket { virtual NextProtoStatus GetNextProto(std::string* proto); // StreamSocket methods: - virtual int Connect(CompletionCallback* callback); + virtual int Connect(OldCompletionCallback* callback); virtual void Disconnect(); virtual bool IsConnected() const; virtual bool IsConnectedAndIdle() const; @@ -77,8 +77,8 @@ class SSLClientSocketOpenSSL : public SSLClientSocket { virtual base::TimeDelta GetConnectTimeMicros() const; // Socket methods: - virtual int Read(IOBuffer* buf, int buf_len, CompletionCallback* callback); - virtual int Write(IOBuffer* buf, int buf_len, CompletionCallback* callback); + virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback); + virtual int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback); virtual bool SetReceiveBufferSize(int32 size); virtual bool SetSendBufferSize(int32 size); @@ -111,16 +111,16 @@ class SSLClientSocketOpenSSL : public SSLClientSocket { void TransportWriteComplete(int result); void TransportReadComplete(int result); - CompletionCallbackImpl<SSLClientSocketOpenSSL> buffer_send_callback_; - CompletionCallbackImpl<SSLClientSocketOpenSSL> buffer_recv_callback_; + OldCompletionCallbackImpl<SSLClientSocketOpenSSL> buffer_send_callback_; + OldCompletionCallbackImpl<SSLClientSocketOpenSSL> buffer_recv_callback_; bool transport_send_busy_; scoped_refptr<DrainableIOBuffer> send_buffer_; bool transport_recv_busy_; scoped_refptr<IOBuffer> recv_buffer_; - CompletionCallback* user_connect_callback_; - CompletionCallback* user_read_callback_; - CompletionCallback* user_write_callback_; + OldCompletionCallback* user_connect_callback_; + OldCompletionCallback* user_read_callback_; + OldCompletionCallback* user_write_callback_; // Used by Read function. scoped_refptr<IOBuffer> user_read_buf_; @@ -142,7 +142,7 @@ class SSLClientSocketOpenSSL : public SSLClientSocket { CertVerifier* const cert_verifier_; scoped_ptr<SingleRequestCertVerifier> verifier_; - CompletionCallbackImpl<SSLClientSocketOpenSSL> handshake_io_callback_; + OldCompletionCallbackImpl<SSLClientSocketOpenSSL> handshake_io_callback_; // OpenSSL stuff SSL* ssl_; |