| 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 20 matching lines...) Expand all Loading... |
| 31 CLEANUP_DISABLED_TYPES, | 31 CLEANUP_DISABLED_TYPES, |
| 32 DOWNLOAD_UPDATES, | 32 DOWNLOAD_UPDATES, |
| 33 PROCESS_CLIENT_COMMAND, | 33 PROCESS_CLIENT_COMMAND, |
| 34 VERIFY_UPDATES, | 34 VERIFY_UPDATES, |
| 35 PROCESS_UPDATES, | 35 PROCESS_UPDATES, |
| 36 STORE_TIMESTAMPS, | 36 STORE_TIMESTAMPS, |
| 37 APPLY_UPDATES, | 37 APPLY_UPDATES, |
| 38 COMMIT, | 38 COMMIT, |
| 39 RESOLVE_CONFLICTS, | 39 RESOLVE_CONFLICTS, |
| 40 APPLY_UPDATES_TO_RESOLVE_CONFLICTS, | 40 APPLY_UPDATES_TO_RESOLVE_CONFLICTS, |
| 41 CLEAR_PRIVATE_DATA, // TODO(tim): Rename 'private' to 'user'. | |
| 42 SYNCER_END | 41 SYNCER_END |
| 43 }; | 42 }; |
| 44 | 43 |
| 45 // A Syncer provides a control interface for driving the individual steps | 44 // A Syncer provides a control interface for driving the individual steps |
| 46 // of the sync cycle. Each cycle (hopefully) moves the client into closer | 45 // of the sync cycle. Each cycle (hopefully) moves the client into closer |
| 47 // synchronization with the server. The individual steps are modeled | 46 // synchronization with the server. The individual steps are modeled |
| 48 // as SyncerCommands, and the ordering of the steps is expressed using | 47 // as SyncerCommands, and the ordering of the steps is expressed using |
| 49 // the SyncerStep enum. | 48 // the SyncerStep enum. |
| 50 // | 49 // |
| 51 // A Syncer instance expects to run on a dedicated thread. Calls | 50 // A Syncer instance expects to run on a dedicated thread. Calls |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 }; | 103 }; |
| 105 | 104 |
| 106 // Utility function declarations. | 105 // Utility function declarations. |
| 107 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); | 106 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); |
| 108 void ClearServerData(syncable::MutableEntry* entry); | 107 void ClearServerData(syncable::MutableEntry* entry); |
| 109 const char* SyncerStepToString(const SyncerStep); | 108 const char* SyncerStepToString(const SyncerStep); |
| 110 | 109 |
| 111 } // namespace browser_sync | 110 } // namespace browser_sync |
| 112 | 111 |
| 113 #endif // SYNC_ENGINE_SYNCER_H_ | 112 #endif // SYNC_ENGINE_SYNCER_H_ |
| OLD | NEW |