OLD | NEW |
| (Empty) |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | |
2 // Use of this source code is governed by a BSD-style license that can be | |
3 // found in the LICENSE file. | |
4 // | |
5 // Utility functions that act on syncable::MutableEntry to resolve conflicts. | |
6 | |
7 #ifndef SYNC_ENGINE_CONFLICT_UTIL_H_ | |
8 #define SYNC_ENGINE_CONFLICT_UTIL_H_ | |
9 | |
10 namespace syncer { | |
11 | |
12 namespace syncable { | |
13 class MutableEntry; | |
14 } | |
15 | |
16 namespace conflict_util { | |
17 | |
18 // Marks the item as no longer requiring sync, allowing the server's version | |
19 // to 'win' during the next update application step. | |
20 void IgnoreLocalChanges(syncable::MutableEntry* entry); | |
21 | |
22 // Marks the item as no longer requiring update from server data. This will | |
23 // cause the item to be committed to the server, overwriting the server's | |
24 // version. | |
25 void OverwriteServerChanges(syncable::MutableEntry* entry); | |
26 | |
27 // The local and server versions are identical, so unset the bits that put them | |
28 // into a conflicting state. | |
29 void IgnoreConflict(syncable::MutableEntry *trans); | |
30 | |
31 } // namespace conflict_util | |
32 } // namespace syncer | |
33 | |
34 #endif // SYNC_ENGINE_CONFLICT_UTIL_H_ | |
OLD | NEW |