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_H_ | 5 #ifndef CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ |
6 #define CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ | 6 #define CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 29 matching lines...) Expand all Loading... |
40 struct HttpResponse; | 40 struct HttpResponse; |
41 | 41 |
42 static const int kDefaultMaxCommitBatchSize = 25; | 42 static const int kDefaultMaxCommitBatchSize = 25; |
43 | 43 |
44 enum SyncerStep { | 44 enum SyncerStep { |
45 SYNCER_BEGIN, | 45 SYNCER_BEGIN, |
46 DOWNLOAD_UPDATES, | 46 DOWNLOAD_UPDATES, |
47 PROCESS_CLIENT_COMMAND, | 47 PROCESS_CLIENT_COMMAND, |
48 VERIFY_UPDATES, | 48 VERIFY_UPDATES, |
49 PROCESS_UPDATES, | 49 PROCESS_UPDATES, |
| 50 STORE_TIMESTAMPS, |
50 APPLY_UPDATES, | 51 APPLY_UPDATES, |
51 BUILD_COMMIT_REQUEST, | 52 BUILD_COMMIT_REQUEST, |
52 POST_COMMIT_MESSAGE, | 53 POST_COMMIT_MESSAGE, |
53 PROCESS_COMMIT_RESPONSE, | 54 PROCESS_COMMIT_RESPONSE, |
54 BUILD_AND_PROCESS_CONFLICT_SETS, | 55 BUILD_AND_PROCESS_CONFLICT_SETS, |
55 RESOLVE_CONFLICTS, | 56 RESOLVE_CONFLICTS, |
56 APPLY_UPDATES_TO_RESOLVE_CONFLICTS, | 57 APPLY_UPDATES_TO_RESOLVE_CONFLICTS, |
57 SYNCER_END | 58 SYNCER_END |
58 }; | 59 }; |
59 | 60 |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 } | 198 } |
198 return false; | 199 return false; |
199 } | 200 } |
200 // Utility function declarations. | 201 // Utility function declarations. |
201 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); | 202 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); |
202 void ClearServerData(syncable::MutableEntry* entry); | 203 void ClearServerData(syncable::MutableEntry* entry); |
203 | 204 |
204 } // namespace browser_sync | 205 } // namespace browser_sync |
205 | 206 |
206 #endif // CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ | 207 #endif // CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ |
OLD | NEW |