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 /jingle/notifier/base/proxy_resolving_client_socket.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 'jingle/notifier/base/proxy_resolving_client_socket.h')
| -rw-r--r-- | jingle/notifier/base/proxy_resolving_client_socket.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/jingle/notifier/base/proxy_resolving_client_socket.h b/jingle/notifier/base/proxy_resolving_client_socket.h index 850bf9b..0cdd533 100644 --- a/jingle/notifier/base/proxy_resolving_client_socket.h +++ b/jingle/notifier/base/proxy_resolving_client_socket.h @@ -45,12 +45,12 @@ class ProxyResolvingClientSocket : public net::StreamSocket { // net::StreamSocket implementation. virtual int Read(net::IOBuffer* buf, int buf_len, - net::CompletionCallback* callback) OVERRIDE; + net::OldCompletionCallback* callback) OVERRIDE; virtual int Write(net::IOBuffer* buf, int buf_len, - net::CompletionCallback* callback) OVERRIDE; + net::OldCompletionCallback* callback) OVERRIDE; virtual bool SetReceiveBufferSize(int32 size) OVERRIDE; virtual bool SetSendBufferSize(int32 size) OVERRIDE; - virtual int Connect(net::CompletionCallback* callback) OVERRIDE; + virtual int Connect(net::OldCompletionCallback* callback) OVERRIDE; virtual void Disconnect() OVERRIDE; virtual bool IsConnected() const OVERRIDE; virtual bool IsConnectedAndIdle() const OVERRIDE; @@ -75,9 +75,9 @@ class ProxyResolvingClientSocket : public net::StreamSocket { void ReportSuccessfulProxyConnection(); // Callbacks passed to net APIs. - net::CompletionCallbackImpl<ProxyResolvingClientSocket> + net::OldCompletionCallbackImpl<ProxyResolvingClientSocket> proxy_resolve_callback_; - net::CompletionCallbackImpl<ProxyResolvingClientSocket> connect_callback_; + net::OldCompletionCallbackImpl<ProxyResolvingClientSocket> connect_callback_; scoped_refptr<net::HttpNetworkSession> network_session_; @@ -94,7 +94,7 @@ class ProxyResolvingClientSocket : public net::StreamSocket { scoped_runnable_method_factory_; // The callback passed to Connect(). - net::CompletionCallback* user_connect_callback_; + net::OldCompletionCallback* user_connect_callback_; }; } // namespace notifier |