| 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 FRIEND_TEST_ALL_PREFIXES(SyncerTest, DeletingEntryWithLocalEdits); | 121 FRIEND_TEST_ALL_PREFIXES(SyncerTest, DeletingEntryWithLocalEdits); |
| 122 FRIEND_TEST_ALL_PREFIXES(EntryCreatedInNewFolderTest, | 122 FRIEND_TEST_ALL_PREFIXES(EntryCreatedInNewFolderTest, |
| 123 EntryCreatedInNewFolderMidSync); | 123 EntryCreatedInNewFolderMidSync); |
| 124 | 124 |
| 125 DISALLOW_COPY_AND_ASSIGN(Syncer); | 125 DISALLOW_COPY_AND_ASSIGN(Syncer); |
| 126 }; | 126 }; |
| 127 | 127 |
| 128 // Utility function declarations. | 128 // Utility function declarations. |
| 129 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); | 129 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); |
| 130 void ClearServerData(syncable::MutableEntry* entry); | 130 void ClearServerData(syncable::MutableEntry* entry); |
| 131 const char* SyncerStepToString(const SyncerStep); |
| 131 | 132 |
| 132 } // namespace browser_sync | 133 } // namespace browser_sync |
| 133 | 134 |
| 134 #endif // CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ | 135 #endif // CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ |
| OLD | NEW |