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_tracker.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_tracker.cc')
-rw-r--r-- | webkit/database/database_tracker.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/webkit/database/database_tracker.cc b/webkit/database/database_tracker.cc index 12c6f5c..1bd532c 100644 --- a/webkit/database/database_tracker.cc +++ b/webkit/database/database_tracker.cc @@ -214,7 +214,7 @@ void DatabaseTracker::DeleteDatabaseIfNeeded(const string16& origin_identifier, if (dbs_to_be_deleted_[origin_identifier].empty()) dbs_to_be_deleted_.erase(origin_identifier); - std::vector<net::CompletionCallback*> to_be_deleted; + std::vector<net::OldCompletionCallback*> to_be_deleted; for (PendingCompletionMap::iterator callback = deletion_callbacks_.begin(); callback != deletion_callbacks_.end(); ++callback) { DatabaseSet::iterator found_origin = @@ -225,14 +225,14 @@ void DatabaseTracker::DeleteDatabaseIfNeeded(const string16& origin_identifier, if (databases.empty()) { callback->second.erase(found_origin); if (callback->second.empty()) { - net::CompletionCallback* cb = callback->first; + net::OldCompletionCallback* cb = callback->first; cb->Run(net::OK); to_be_deleted.push_back(cb); } } } } - for (std::vector<net::CompletionCallback*>::iterator cb = + for (std::vector<net::OldCompletionCallback*>::iterator cb = to_be_deleted.begin(); cb != to_be_deleted.end(); ++cb) deletion_callbacks_.erase(*cb); } @@ -629,7 +629,7 @@ void DatabaseTracker::ScheduleDatabaseForDeletion( void DatabaseTracker::ScheduleDatabasesForDeletion( const DatabaseSet& databases, - net::CompletionCallback* callback) { + net::OldCompletionCallback* callback) { DCHECK(!callback || deletion_callbacks_.find(callback) == deletion_callbacks_.end()); DCHECK(!databases.empty()); @@ -645,7 +645,7 @@ void DatabaseTracker::ScheduleDatabasesForDeletion( int DatabaseTracker::DeleteDatabase(const string16& origin_identifier, const string16& database_name, - net::CompletionCallback* callback) { + net::OldCompletionCallback* callback) { if (!LazyInit()) return net::ERR_FAILED; @@ -665,7 +665,7 @@ int DatabaseTracker::DeleteDatabase(const string16& origin_identifier, int DatabaseTracker::DeleteDataModifiedSince( const base::Time& cutoff, - net::CompletionCallback* callback) { + net::OldCompletionCallback* callback) { if (!LazyInit()) return net::ERR_FAILED; @@ -715,7 +715,7 @@ int DatabaseTracker::DeleteDataModifiedSince( } int DatabaseTracker::DeleteDataForOrigin(const string16& origin, - net::CompletionCallback* callback) { + net::OldCompletionCallback* callback) { if (!LazyInit()) return net::ERR_FAILED; |