OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_SYNC_ENGINE_SYNCER_TYPES_H_ | 5 #ifndef CHROME_BROWSER_SYNC_ENGINE_SYNCER_TYPES_H_ |
6 #define CHROME_BROWSER_SYNC_ENGINE_SYNCER_TYPES_H_ | 6 #define CHROME_BROWSER_SYNC_ENGINE_SYNCER_TYPES_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 13 matching lines...) Expand all Loading... |
24 class SyncerSession; | 24 class SyncerSession; |
25 class Syncer; | 25 class Syncer; |
26 | 26 |
27 enum UpdateAttemptResponse { | 27 enum UpdateAttemptResponse { |
28 // Update was applied or safely ignored. | 28 // Update was applied or safely ignored. |
29 SUCCESS, | 29 SUCCESS, |
30 | 30 |
31 // Conflicts with the local data representation. This can also mean that the | 31 // Conflicts with the local data representation. This can also mean that the |
32 // entry doesn't currently make sense if we applied it. | 32 // entry doesn't currently make sense if we applied it. |
33 CONFLICT, | 33 CONFLICT, |
34 | |
35 // This return value is only returned by AttemptToUpdateEntryWithoutMerge | |
36 // if we have a name conflict. Users of AttemptToUpdateEntry should never | |
37 // see this return value, we'll return CONFLICT. | |
38 NAME_CONFLICT, | |
39 }; | 34 }; |
40 | 35 |
41 enum ServerUpdateProcessingResult { | 36 enum ServerUpdateProcessingResult { |
42 // Success. Update applied and stored in SERVER_* fields or dropped if | 37 // Success. Update applied and stored in SERVER_* fields or dropped if |
43 // irrelevant. | 38 // irrelevant. |
44 SUCCESS_PROCESSED, | 39 SUCCESS_PROCESSED, |
45 | 40 |
46 // Success. Update details stored in SERVER_* fields, but wasn't applied. | 41 // Success. Update details stored in SERVER_* fields, but wasn't applied. |
47 SUCCESS_STORED, | 42 SUCCESS_STORED, |
48 | 43 |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 // one sync loop. It lives on the stack. We don't expose the number of | 129 // one sync loop. It lives on the stack. We don't expose the number of |
135 // conflicts during SyncShare as the conflicts may be solved automatically | 130 // conflicts during SyncShare as the conflicts may be solved automatically |
136 // by the conflict resolver. | 131 // by the conflict resolver. |
137 typedef std::vector<syncable::Id> ConflictSet; | 132 typedef std::vector<syncable::Id> ConflictSet; |
138 | 133 |
139 typedef std::map<syncable::Id, ConflictSet*> IdToConflictSetMap; | 134 typedef std::map<syncable::Id, ConflictSet*> IdToConflictSetMap; |
140 | 135 |
141 } // namespace browser_sync | 136 } // namespace browser_sync |
142 | 137 |
143 #endif // CHROME_BROWSER_SYNC_ENGINE_SYNCER_TYPES_H_ | 138 #endif // CHROME_BROWSER_SYNC_ENGINE_SYNCER_TYPES_H_ |
OLD | NEW |