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

Side by Side Diff: sync/engine/conflict_resolver.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/conflict_resolver.h ('k') | sync/engine/download_updates_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/conflict_resolver.h" 5 #include "sync/engine/conflict_resolver.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 14 matching lines...) Expand all
25 using std::set; 25 using std::set;
26 using syncable::BaseTransaction; 26 using syncable::BaseTransaction;
27 using syncable::Directory; 27 using syncable::Directory;
28 using syncable::Entry; 28 using syncable::Entry;
29 using syncable::GetModelTypeFromSpecifics; 29 using syncable::GetModelTypeFromSpecifics;
30 using syncable::Id; 30 using syncable::Id;
31 using syncable::IsRealDataType; 31 using syncable::IsRealDataType;
32 using syncable::MutableEntry; 32 using syncable::MutableEntry;
33 using syncable::WriteTransaction; 33 using syncable::WriteTransaction;
34 34
35 namespace csync { 35 namespace syncer {
36 36
37 using sessions::ConflictProgress; 37 using sessions::ConflictProgress;
38 using sessions::StatusController; 38 using sessions::StatusController;
39 39
40 namespace { 40 namespace {
41 41
42 const int SYNC_CYCLES_BEFORE_ADMITTING_DEFEAT = 8; 42 const int SYNC_CYCLES_BEFORE_ADMITTING_DEFEAT = 8;
43 43
44 } // namespace 44 } // namespace
45 45
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 case SYNC_PROGRESS: 410 case SYNC_PROGRESS:
411 forward_progress = true; 411 forward_progress = true;
412 break; 412 break;
413 } 413 }
414 processed_items.insert(id); 414 processed_items.insert(id);
415 } 415 }
416 } 416 }
417 return forward_progress; 417 return forward_progress;
418 } 418 }
419 419
420 } // namespace csync 420 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/engine/conflict_resolver.h ('k') | sync/engine/download_updates_command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698