summaryrefslogtreecommitdiffstats
path: root/remoting/jingle_glue/ssl_socket_adapter.h
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 20:38:10 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 20:38:10 +0000
commitf1f3f0f8af3740ec2afaebcaed410950a9cc0ac8 (patch)
tree6ccdd87ccfc89adbcb372c517559fa61fbc6c6b2 /remoting/jingle_glue/ssl_socket_adapter.h
parentd1666539b57bf8552e203d355fd09909d36f9732 (diff)
downloadchromium_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 'remoting/jingle_glue/ssl_socket_adapter.h')
-rw-r--r--remoting/jingle_glue/ssl_socket_adapter.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/remoting/jingle_glue/ssl_socket_adapter.h b/remoting/jingle_glue/ssl_socket_adapter.h
index e990310..2930b47 100644
--- a/remoting/jingle_glue/ssl_socket_adapter.h
+++ b/remoting/jingle_glue/ssl_socket_adapter.h
@@ -41,7 +41,7 @@ class TransportSocket : public net::StreamSocket, public sigslot::has_slots<> {
// net::StreamSocket implementation
- virtual int Connect(net::CompletionCallback* callback);
+ virtual int Connect(net::OldCompletionCallback* callback);
virtual void Disconnect();
virtual bool IsConnected() const;
virtual bool IsConnectedAndIdle() const;
@@ -58,9 +58,9 @@ class TransportSocket : public net::StreamSocket, public sigslot::has_slots<> {
// net::Socket implementation
virtual int Read(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback);
+ net::OldCompletionCallback* callback);
virtual int Write(net::IOBuffer* buf, int buf_len,
- net::CompletionCallback* callback);
+ net::OldCompletionCallback* callback);
virtual bool SetReceiveBufferSize(int32 size);
virtual bool SetSendBufferSize(int32 size);
@@ -70,8 +70,8 @@ class TransportSocket : public net::StreamSocket, public sigslot::has_slots<> {
void OnReadEvent(talk_base::AsyncSocket* socket);
void OnWriteEvent(talk_base::AsyncSocket* socket);
- net::CompletionCallback* read_callback_;
- net::CompletionCallback* write_callback_;
+ net::OldCompletionCallback* read_callback_;
+ net::OldCompletionCallback* write_callback_;
scoped_refptr<net::IOBuffer> read_buffer_;
int read_buffer_len_;
@@ -141,9 +141,9 @@ class SSLSocketAdapter : public talk_base::SSLAdapter {
scoped_ptr<net::CertVerifier> cert_verifier_;
scoped_ptr<net::SSLClientSocket> ssl_socket_;
- net::CompletionCallbackImpl<SSLSocketAdapter> connected_callback_;
- net::CompletionCallbackImpl<SSLSocketAdapter> read_callback_;
- net::CompletionCallbackImpl<SSLSocketAdapter> write_callback_;
+ net::OldCompletionCallbackImpl<SSLSocketAdapter> connected_callback_;
+ net::OldCompletionCallbackImpl<SSLSocketAdapter> read_callback_;
+ net::OldCompletionCallbackImpl<SSLSocketAdapter> write_callback_;
SSLState ssl_state_;
IOState read_state_;
IOState write_state_;