Index: chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h |
diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h |
index e12484027bd3603a63c301e1e47b241dec96fbfe..d865b9877a059a102b24fbd15dd6b5f6f1c3a6d2 100644 |
--- a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h |
+++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h |
@@ -101,7 +101,7 @@ class DriveFileSyncService : public RemoteFileSyncService, |
virtual LocalChangeProcessor* GetLocalChangeProcessor() OVERRIDE; |
virtual bool IsConflicting(const fileapi::FileSystemURL& url) OVERRIDE; |
virtual RemoteServiceState GetCurrentState() const OVERRIDE; |
- virtual void GetOriginStatusMap(OriginStatusMap* status_map) OVERRIDE; |
+ virtual void GetOriginStatusMap(const StatusMapCallback& callback) OVERRIDE; |
virtual void DumpFiles(const GURL& origin, |
const ListCallback& callback) OVERRIDE; |
virtual void DumpDatabase(const ListCallback& callback) OVERRIDE; |
@@ -369,7 +369,7 @@ class DriveFileSyncService : public RemoteFileSyncService, |
int64 largest_fetched_changestamp_; |
- std::map<GURL, std::string> pending_batch_sync_origins_; |
+ OriginStatusMap pending_batch_sync_origins_; |
tzik
2014/05/22 05:14:13
Could you revert this?
This is not a OriginStatusM
peria
2014/05/22 06:11:44
Done.
|
// Is set to true when there's a fair possibility that we have some |
// remote changes that haven't been fetched yet. |