| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 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 | 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 SYNC_ENGINE_SYNCER_H_ | 5 #ifndef SYNC_ENGINE_SYNCER_H_ |
| 6 #define SYNC_ENGINE_SYNCER_H_ | 6 #define SYNC_ENGINE_SYNCER_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 | 29 |
| 30 enum SyncerStep { | 30 enum SyncerStep { |
| 31 SYNCER_BEGIN, | 31 SYNCER_BEGIN, |
| 32 CLEANUP_DISABLED_TYPES, | 32 CLEANUP_DISABLED_TYPES, |
| 33 DOWNLOAD_UPDATES, | 33 DOWNLOAD_UPDATES, |
| 34 PROCESS_CLIENT_COMMAND, | 34 PROCESS_CLIENT_COMMAND, |
| 35 VERIFY_UPDATES, | 35 VERIFY_UPDATES, |
| 36 PROCESS_UPDATES, | 36 PROCESS_UPDATES, |
| 37 STORE_TIMESTAMPS, | 37 STORE_TIMESTAMPS, |
| 38 APPLY_UPDATES, | 38 APPLY_UPDATES, |
| 39 BUILD_COMMIT_REQUEST, | 39 COMMIT, |
| 40 POST_COMMIT_MESSAGE, | |
| 41 PROCESS_COMMIT_RESPONSE, | |
| 42 RESOLVE_CONFLICTS, | 40 RESOLVE_CONFLICTS, |
| 43 APPLY_UPDATES_TO_RESOLVE_CONFLICTS, | 41 APPLY_UPDATES_TO_RESOLVE_CONFLICTS, |
| 44 CLEAR_PRIVATE_DATA, // TODO(tim): Rename 'private' to 'user'. | 42 CLEAR_PRIVATE_DATA, // TODO(tim): Rename 'private' to 'user'. |
| 45 SYNCER_END | 43 SYNCER_END |
| 46 }; | 44 }; |
| 47 | 45 |
| 48 // A Syncer provides a control interface for driving the individual steps | 46 // A Syncer provides a control interface for driving the individual steps |
| 49 // of the sync cycle. Each cycle (hopefully) moves the client into closer | 47 // of the sync cycle. Each cycle (hopefully) moves the client into closer |
| 50 // synchronization with the server. The individual steps are modeled | 48 // synchronization with the server. The individual steps are modeled |
| 51 // as SyncerCommands, and the ordering of the steps is expressed using | 49 // as SyncerCommands, and the ordering of the steps is expressed using |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 }; | 105 }; |
| 108 | 106 |
| 109 // Utility function declarations. | 107 // Utility function declarations. |
| 110 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); | 108 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); |
| 111 void ClearServerData(syncable::MutableEntry* entry); | 109 void ClearServerData(syncable::MutableEntry* entry); |
| 112 const char* SyncerStepToString(const SyncerStep); | 110 const char* SyncerStepToString(const SyncerStep); |
| 113 | 111 |
| 114 } // namespace browser_sync | 112 } // namespace browser_sync |
| 115 | 113 |
| 116 #endif // SYNC_ENGINE_SYNCER_H_ | 114 #endif // SYNC_ENGINE_SYNCER_H_ |
| OLD | NEW |