diff options
Diffstat (limited to 'sync/engine/conflict_resolver.h')
-rw-r--r-- | sync/engine/conflict_resolver.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sync/engine/conflict_resolver.h b/sync/engine/conflict_resolver.h index 4ca614d..5838623 100644 --- a/sync/engine/conflict_resolver.h +++ b/sync/engine/conflict_resolver.h @@ -22,6 +22,7 @@ class WriteTransaction; } // namespace syncable class Cryptographer; +struct UpdateCounters; namespace sessions { class StatusController; @@ -52,14 +53,16 @@ class ConflictResolver { void ResolveConflicts(syncable::WriteTransaction* trans, const Cryptographer* cryptographer, const std::set<syncable::Id>& simple_conflict_ids, - sessions::StatusController* status); + sessions::StatusController* status, + UpdateCounters* counters); private: void ProcessSimpleConflict( syncable::WriteTransaction* trans, const syncable::Id& id, const Cryptographer* cryptographer, - sessions::StatusController* status); + sessions::StatusController* status, + UpdateCounters* counters); DISALLOW_COPY_AND_ASSIGN(ConflictResolver); }; |