| Index: chrome/browser/sync_file_system/drive_file_sync_service.h
|
| diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.h b/chrome/browser/sync_file_system/drive_file_sync_service.h
|
| index 7f3a576793c91d73282f708477f9f0e93c85b3d1..cce8587bc983ea589bc0cfc2ccb3473f2ea77fa3 100644
|
| --- a/chrome/browser/sync_file_system/drive_file_sync_service.h
|
| +++ b/chrome/browser/sync_file_system/drive_file_sync_service.h
|
| @@ -142,8 +142,8 @@ class DriveFileSyncService
|
|
|
| // TODO(tzik): Consider using std::pair<FilePath, FileType> as the key below
|
| // to support directories and custom conflict handling.
|
| - typedef std::map<FilePath, RemoteChange> PathToChange;
|
| - typedef std::map<GURL, PathToChange> URLToChange;
|
| + typedef std::map<FilePath, RemoteChange> PathToChangeMap;
|
| + typedef std::map<GURL, PathToChangeMap> OriginToChangesMap;
|
|
|
| // Task types; used for task token handling.
|
| enum TaskType {
|
| @@ -346,7 +346,7 @@ class DriveFileSyncService
|
| int64 largest_fetched_changestamp_;
|
|
|
| PendingChangeQueue pending_changes_;
|
| - URLToChange url_to_change_;
|
| + OriginToChangesMap origin_to_changes_map_;
|
|
|
| std::set<GURL> pending_batch_sync_origins_;
|
|
|
|
|