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

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

Issue 10698014: [Sync] Rename csync namespace to syncer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 5 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/syncer.h ('k') | sync/engine/syncer_command.h » ('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 #include "sync/engine/syncer.h" 5 #include "sync/engine/syncer.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 24 matching lines...) Expand all
35 using syncable::SERVER_CTIME; 35 using syncable::SERVER_CTIME;
36 using syncable::SERVER_IS_DEL; 36 using syncable::SERVER_IS_DEL;
37 using syncable::SERVER_IS_DIR; 37 using syncable::SERVER_IS_DIR;
38 using syncable::SERVER_MTIME; 38 using syncable::SERVER_MTIME;
39 using syncable::SERVER_NON_UNIQUE_NAME; 39 using syncable::SERVER_NON_UNIQUE_NAME;
40 using syncable::SERVER_PARENT_ID; 40 using syncable::SERVER_PARENT_ID;
41 using syncable::SERVER_POSITION_IN_PARENT; 41 using syncable::SERVER_POSITION_IN_PARENT;
42 using syncable::SERVER_SPECIFICS; 42 using syncable::SERVER_SPECIFICS;
43 using syncable::SERVER_VERSION; 43 using syncable::SERVER_VERSION;
44 44
45 namespace csync { 45 namespace syncer {
46 46
47 using sessions::ScopedSessionContextConflictResolver; 47 using sessions::ScopedSessionContextConflictResolver;
48 using sessions::StatusController; 48 using sessions::StatusController;
49 using sessions::SyncSession; 49 using sessions::SyncSession;
50 using sessions::ConflictProgress; 50 using sessions::ConflictProgress;
51 51
52 #define ENUM_CASE(x) case x: return #x 52 #define ENUM_CASE(x) case x: return #x
53 const char* SyncerStepToString(const SyncerStep step) 53 const char* SyncerStepToString(const SyncerStep step)
54 { 54 {
55 switch (step) { 55 switch (step) {
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 entry->Put(SERVER_MTIME, Time()); 289 entry->Put(SERVER_MTIME, Time());
290 entry->Put(SERVER_CTIME, Time()); 290 entry->Put(SERVER_CTIME, Time());
291 entry->Put(SERVER_VERSION, 0); 291 entry->Put(SERVER_VERSION, 0);
292 entry->Put(SERVER_IS_DIR, false); 292 entry->Put(SERVER_IS_DIR, false);
293 entry->Put(SERVER_IS_DEL, false); 293 entry->Put(SERVER_IS_DEL, false);
294 entry->Put(IS_UNAPPLIED_UPDATE, false); 294 entry->Put(IS_UNAPPLIED_UPDATE, false);
295 entry->Put(SERVER_SPECIFICS, sync_pb::EntitySpecifics::default_instance()); 295 entry->Put(SERVER_SPECIFICS, sync_pb::EntitySpecifics::default_instance());
296 entry->Put(SERVER_POSITION_IN_PARENT, 0); 296 entry->Put(SERVER_POSITION_IN_PARENT, 0);
297 } 297 }
298 298
299 } // namespace csync 299 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/engine/syncer.h ('k') | sync/engine/syncer_command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698