| Index: sync/sessions/nudge_tracker.h
|
| diff --git a/sync/sessions/nudge_tracker.h b/sync/sessions/nudge_tracker.h
|
| index 2bf9da108f7e2f596921caea5c0e7c829882b1eb..ec2277c5052e2d4427bd9d48af8dc5c8874c5b92 100644
|
| --- a/sync/sessions/nudge_tracker.h
|
| +++ b/sync/sessions/nudge_tracker.h
|
| @@ -70,6 +70,10 @@ class SYNC_EXPORT_PRIVATE NudgeTracker {
|
| // Take note that an initial sync is pending for this type.
|
| void RecordInitialSyncRequired(syncer::ModelType type);
|
|
|
| + // Takes note that the conflict happended for this type, need to sync to
|
| + // resolve conflict locally.
|
| + void RecordCommitConflict(syncer::ModelType type);
|
| +
|
| // These functions should be called to keep this class informed of the status
|
| // of the connection to the invalidations server.
|
| void OnInvalidationsEnabled();
|
|
|