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 /webkit/database/database_quota_client.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 'webkit/database/database_quota_client.cc')
| -rw-r--r-- | webkit/database/database_quota_client.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/webkit/database/database_quota_client.cc b/webkit/database/database_quota_client.cc index f72910d..32482fd 100644 --- a/webkit/database/database_quota_client.cc +++ b/webkit/database/database_quota_client.cc @@ -143,7 +143,7 @@ class DatabaseQuotaClient::DeleteOriginTask : public HelperTask { result_(quota::kQuotaStatusUnknown), caller_callback_(caller_callback), ALLOW_THIS_IN_INITIALIZER_LIST(completion_callback_( - this, &DeleteOriginTask::OnCompletionCallback)) { + this, &DeleteOriginTask::OnOldCompletionCallback)) { } private: @@ -159,16 +159,16 @@ class DatabaseQuotaClient::DeleteOriginTask : public HelperTask { } virtual bool RunOnTargetThreadAsync() OVERRIDE { - AddRef(); // balanced in OnCompletionCallback + AddRef(); // balanced in OnOldCompletionCallback string16 origin_id = DatabaseUtil::GetOriginIdentifier(origin_url_); int rv = db_tracker_->DeleteDataForOrigin(origin_id, &completion_callback_); if (rv == net::ERR_IO_PENDING) return false; // we wait for the callback - OnCompletionCallback(rv); + OnOldCompletionCallback(rv); return false; } - void OnCompletionCallback(int rv) { + void OnOldCompletionCallback(int rv) { if (rv == net::OK) result_ = quota::kQuotaStatusOk; original_message_loop()->PostTask( @@ -179,7 +179,7 @@ class DatabaseQuotaClient::DeleteOriginTask : public HelperTask { const GURL origin_url_; quota::QuotaStatusCode result_; scoped_ptr<DeletionCallback> caller_callback_; - net::CompletionCallbackImpl<DeleteOriginTask> completion_callback_; + net::OldCompletionCallbackImpl<DeleteOriginTask> completion_callback_; }; // DatabaseQuotaClient -------------------------------------------------------- |