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

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: Refactoring 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..950e9f8b47b1e9a2440efb90d1cecc576ee05b60 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,26 +229,29 @@ RemoteServiceState DriveFileSyncService::GetCurrentState() const {
return state_;
}
-void DriveFileSyncService::GetOriginStatusMap(OriginStatusMap* status_map) {
- DCHECK(status_map);
+void DriveFileSyncService::GetOriginStatusMap(
+ const StatusMapCallback& callback) {
+ OriginStatusMap status_map;
// Add batch sync origins held by DriveFileSyncService.
- typedef std::map<GURL, std::string>::const_iterator iterator;
+ typedef OriginStatusMap::const_iterator iterator;
for (iterator itr = pending_batch_sync_origins_.begin();
itr != pending_batch_sync_origins_.end();
++itr)
- (*status_map)[itr->first] = "Pending";
+ status_map[itr->first] = "Pending";
// Add incremental and disabled origins held by DriveMetadataStore.
for (iterator itr = metadata_store_->incremental_sync_origins().begin();
itr != metadata_store_->incremental_sync_origins().end();
++itr)
- (*status_map)[itr->first] = "Enabled";
+ status_map[itr->first] = "Enabled";
for (iterator itr = metadata_store_->disabled_origins().begin();
itr != metadata_store_->disabled_origins().end();
++itr)
- (*status_map)[itr->first] = "Disabled";
+ status_map[itr->first] = "Disabled";
+
+ callback.Run(status_map);
}
void DriveFileSyncService::DumpFiles(const GURL& origin,

Powered by Google App Engine
This is Rietveld 408576698