Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Side by Side Diff: sync/engine/syncer.h

Issue 10541079: [Sync] Remove CleanupDisabledTypes command and move purge logic into SyncManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sync/engine/sync_scheduler_unittest.cc ('k') | sync/engine/syncer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/internal_api/public/base/model_type.h" 16 #include "sync/internal_api/public/base/model_type.h"
17 #include "sync/sessions/sync_session.h" 17 #include "sync/sessions/sync_session.h"
18 #include "sync/util/extensions_activity_monitor.h" 18 #include "sync/util/extensions_activity_monitor.h"
19 19
20 namespace syncer { 20 namespace syncer {
21 21
22 namespace syncable { 22 namespace syncable {
23 class Entry; 23 class Entry;
24 class MutableEntry; 24 class MutableEntry;
25 } // namespace syncable 25 } // namespace syncable
26 26
27 enum SyncerStep { 27 enum SyncerStep {
28 SYNCER_BEGIN, 28 SYNCER_BEGIN,
29 CLEANUP_DISABLED_TYPES,
30 DOWNLOAD_UPDATES, 29 DOWNLOAD_UPDATES,
31 PROCESS_CLIENT_COMMAND, 30 PROCESS_CLIENT_COMMAND,
32 VERIFY_UPDATES, 31 VERIFY_UPDATES,
33 PROCESS_UPDATES, 32 PROCESS_UPDATES,
34 STORE_TIMESTAMPS, 33 STORE_TIMESTAMPS,
35 APPLY_UPDATES, 34 APPLY_UPDATES,
36 COMMIT, 35 COMMIT,
37 RESOLVE_CONFLICTS, 36 RESOLVE_CONFLICTS,
38 APPLY_UPDATES_TO_RESOLVE_CONFLICTS, 37 APPLY_UPDATES_TO_RESOLVE_CONFLICTS,
39 SYNCER_END 38 SYNCER_END
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 }; 100 };
102 101
103 // Utility function declarations. 102 // Utility function declarations.
104 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest); 103 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest);
105 void ClearServerData(syncable::MutableEntry* entry); 104 void ClearServerData(syncable::MutableEntry* entry);
106 const char* SyncerStepToString(const SyncerStep); 105 const char* SyncerStepToString(const SyncerStep);
107 106
108 } // namespace syncer 107 } // namespace syncer
109 108
110 #endif // SYNC_ENGINE_SYNCER_H_ 109 #endif // SYNC_ENGINE_SYNCER_H_
OLDNEW
« no previous file with comments | « sync/engine/sync_scheduler_unittest.cc ('k') | sync/engine/syncer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698