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 | 7 |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
12 #include "base/gtest_prod_util.h" | 12 #include "base/gtest_prod_util.h" |
13 #include "base/synchronization/lock.h" | 13 #include "base/synchronization/lock.h" |
14 #include "sync/engine/conflict_resolver.h" | 14 #include "sync/engine/conflict_resolver.h" |
15 #include "sync/engine/syncer_types.h" | 15 #include "sync/engine/syncer_types.h" |
16 #include "sync/engine/syncproto.h" | |
17 #include "sync/internal_api/public/base/model_type.h" | 16 #include "sync/internal_api/public/base/model_type.h" |
18 #include "sync/sessions/sync_session.h" | 17 #include "sync/sessions/sync_session.h" |
19 #include "sync/util/extensions_activity_monitor.h" | 18 #include "sync/util/extensions_activity_monitor.h" |
20 | 19 |
21 namespace syncer { | 20 namespace syncer { |
22 | 21 |
23 namespace syncable { | 22 namespace syncable { |
24 class Entry; | 23 class Entry; |
25 class MutableEntry; | 24 class MutableEntry; |
26 } // namespace syncable | 25 } // namespace syncable |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 }; | 101 }; |
103 | 102 |
104 // Utility function declarations. | 103 // Utility function declarations. |
105 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); | 104 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); |
106 void ClearServerData(syncable::MutableEntry* entry); | 105 void ClearServerData(syncable::MutableEntry* entry); |
107 const char* SyncerStepToString(const SyncerStep); | 106 const char* SyncerStepToString(const SyncerStep); |
108 | 107 |
109 } // namespace syncer | 108 } // namespace syncer |
110 | 109 |
111 #endif // SYNC_ENGINE_SYNCER_H_ | 110 #endif // SYNC_ENGINE_SYNCER_H_ |
OLD | NEW |