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

Unified Diff: chrome/browser/sync_file_system/drive_file_sync_service.h

Issue 11665029: Sync FileSystem: Mark empty batch sync origin as incremental sync origin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert android exclusion Created 7 years, 11 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_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_;

Powered by Google App Engine
This is Rietveld 408576698