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 CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ | 5 #ifndef SYNC_ENGINE_SYNCER_H_ |
6 #define CHROME_BROWSER_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> |
11 | 11 |
12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
13 #include "base/gtest_prod_util.h" | 13 #include "base/gtest_prod_util.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "base/synchronization/lock.h" | 15 #include "base/synchronization/lock.h" |
16 #include "chrome/browser/sync/engine/conflict_resolver.h" | 16 #include "sync/engine/conflict_resolver.h" |
17 #include "chrome/browser/sync/engine/syncer_types.h" | 17 #include "sync/engine/syncer_types.h" |
18 #include "chrome/browser/sync/engine/syncproto.h" | 18 #include "sync/engine/syncproto.h" |
19 #include "chrome/browser/sync/sessions/sync_session.h" | 19 #include "sync/sessions/sync_session.h" |
20 #include "chrome/browser/sync/syncable/model_type.h" | 20 #include "sync/syncable/model_type.h" |
21 #include "chrome/browser/sync/util/extensions_activity_monitor.h" | 21 #include "sync/util/extensions_activity_monitor.h" |
22 | 22 |
23 namespace syncable { | 23 namespace syncable { |
24 class Entry; | 24 class Entry; |
25 class MutableEntry; | 25 class MutableEntry; |
26 } // namespace syncable | 26 } // namespace syncable |
27 | 27 |
28 namespace browser_sync { | 28 namespace browser_sync { |
29 | 29 |
30 enum SyncerStep { | 30 enum SyncerStep { |
31 SYNCER_BEGIN, | 31 SYNCER_BEGIN, |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 DISALLOW_COPY_AND_ASSIGN(Syncer); | 106 DISALLOW_COPY_AND_ASSIGN(Syncer); |
107 }; | 107 }; |
108 | 108 |
109 // Utility function declarations. | 109 // Utility function declarations. |
110 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); | 110 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); |
111 void ClearServerData(syncable::MutableEntry* entry); | 111 void ClearServerData(syncable::MutableEntry* entry); |
112 const char* SyncerStepToString(const SyncerStep); | 112 const char* SyncerStepToString(const SyncerStep); |
113 | 113 |
114 } // namespace browser_sync | 114 } // namespace browser_sync |
115 | 115 |
116 #endif // CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_ | 116 #endif // SYNC_ENGINE_SYNCER_H_ |
OLD | NEW |