Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(473)

Unified Diff: chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc

Issue 294893005: [SyncFS] Make GetOriginStatusMap asynchronous (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: scoped_ptr Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc
diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc
index fb28520debd5519da0eb94f1b97309f7e58d0beb..647055afd9a8e4c912135a71e7f0804be886eb86 100644
--- a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc
@@ -229,11 +229,12 @@ RemoteServiceState DriveFileSyncService::GetCurrentState() const {
return state_;
}
-void DriveFileSyncService::GetOriginStatusMap(OriginStatusMap* status_map) {
- DCHECK(status_map);
+void DriveFileSyncService::GetOriginStatusMap(
+ const StatusMapCallback& callback) {
+ scoped_ptr<OriginStatusMap> status_map(new OriginStatusMap);
// Add batch sync origins held by DriveFileSyncService.
- typedef std::map<GURL, std::string>::const_iterator iterator;
+ typedef OriginStatusMap::const_iterator iterator;
tzik 2014/05/22 05:14:13 ditto
peria 2014/05/22 06:11:44 Done.
for (iterator itr = pending_batch_sync_origins_.begin();
itr != pending_batch_sync_origins_.end();
++itr)
@@ -249,6 +250,8 @@ void DriveFileSyncService::GetOriginStatusMap(OriginStatusMap* status_map) {
itr != metadata_store_->disabled_origins().end();
++itr)
(*status_map)[itr->first] = "Disabled";
+
+ callback.Run(status_map.Pass());
}
void DriveFileSyncService::DumpFiles(const GURL& origin,

Powered by Google App Engine
This is Rietveld 408576698