summaryrefslogtreecommitdiffstats
path: root/net/ftp/ftp_network_transaction.cc
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 /net/ftp/ftp_network_transaction.cc
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 'net/ftp/ftp_network_transaction.cc')
-rw-r--r--net/ftp/ftp_network_transaction.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index 4a3a413..56dd311 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -237,12 +237,12 @@ int FtpNetworkTransaction::Stop(int error) {
}
int FtpNetworkTransaction::RestartIgnoringLastError(
- CompletionCallback* callback) {
+ OldCompletionCallback* callback) {
return ERR_NOT_IMPLEMENTED;
}
int FtpNetworkTransaction::Start(const FtpRequestInfo* request_info,
- CompletionCallback* callback,
+ OldCompletionCallback* callback,
const BoundNetLog& net_log) {
net_log_ = net_log;
request_ = request_info;
@@ -265,7 +265,7 @@ int FtpNetworkTransaction::Start(const FtpRequestInfo* request_info,
int FtpNetworkTransaction::RestartWithAuth(const string16& username,
const string16& password,
- CompletionCallback* callback) {
+ OldCompletionCallback* callback) {
ResetStateForRestart();
username_ = username;
@@ -280,7 +280,7 @@ int FtpNetworkTransaction::RestartWithAuth(const string16& username,
int FtpNetworkTransaction::Read(IOBuffer* buf,
int buf_len,
- CompletionCallback* callback) {
+ OldCompletionCallback* callback) {
DCHECK(buf);
DCHECK_GT(buf_len, 0);
@@ -347,7 +347,7 @@ void FtpNetworkTransaction::DoCallback(int rv) {
DCHECK(user_callback_);
// Since Run may result in Read being called, clear callback_ up front.
- CompletionCallback* c = user_callback_;
+ OldCompletionCallback* c = user_callback_;
user_callback_ = NULL;
c->Run(rv);
}