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/websockets/websocket_job.cc | |
| 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/websockets/websocket_job.cc')
| -rw-r--r-- | net/websockets/websocket_job.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc index cbf7592..18db83c 100644 --- a/net/websockets/websocket_job.cc +++ b/net/websockets/websocket_job.cc @@ -182,7 +182,7 @@ void WebSocketJob::DetachDelegate() { } int WebSocketJob::OnStartOpenConnection( - SocketStream* socket, CompletionCallback* callback) { + SocketStream* socket, OldCompletionCallback* callback) { DCHECK(!callback_); state_ = CONNECTING; addresses_ = socket->address_list(); @@ -633,7 +633,7 @@ void WebSocketJob::RetryPendingIO() { void WebSocketJob::CompleteIO(int result) { // |callback_| may be NULL if OnClose() or DetachDelegate() was called. if (callback_) { - net::CompletionCallback* callback = callback_; + net::OldCompletionCallback* callback = callback_; callback_ = NULL; callback->Run(result); Release(); // Balanced with OnStartOpenConnection(). |