| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 FRIEND_TEST_ALL_PREFIXES(SyncerTest, DeletingEntryWithLocalEdits); | 131 FRIEND_TEST_ALL_PREFIXES(SyncerTest, DeletingEntryWithLocalEdits); |
| 132 FRIEND_TEST_ALL_PREFIXES(EntryCreatedInNewFolderTest, | 132 FRIEND_TEST_ALL_PREFIXES(EntryCreatedInNewFolderTest, |
| 133 EntryCreatedInNewFolderMidSync); | 133 EntryCreatedInNewFolderMidSync); |
| 134 | 134 |
| 135 DISALLOW_COPY_AND_ASSIGN(Syncer); | 135 DISALLOW_COPY_AND_ASSIGN(Syncer); |
| 136 }; | 136 }; |
| 137 | 137 |
| 138 // Utility function declarations. | 138 // Utility function declarations. |
| 139 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); | 139 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); |
| 140 void ClearServerData(syncable::MutableEntry* entry); | 140 void ClearServerData(syncable::MutableEntry* entry); |
| 141 const char* SyncerStepToString(const SyncerStep); |
| 141 | 142 |
| 142 } // namespace browser_sync | 143 } // namespace browser_sync |
| 143 | 144 |
| 144 #endif // CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ | 145 #endif // CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ |
| OLD | NEW |