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

Side by Side Diff: chrome/browser/sync/engine/conflict_resolver.cc

Issue 414072: sync: get rid of path_helpers (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: delete path_helpers_unittest from gyp Created 11 years 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 | « no previous file | chrome/browser/sync/engine/syncer_util.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 entry. 3 // found in the LICENSE entry.
4 4
5 #include "chrome/browser/sync/engine/conflict_resolver.h" 5 #include "chrome/browser/sync/engine/conflict_resolver.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "chrome/browser/sync/engine/syncer.h" 10 #include "chrome/browser/sync/engine/syncer.h"
11 #include "chrome/browser/sync/engine/syncer_util.h" 11 #include "chrome/browser/sync/engine/syncer_util.h"
12 #include "chrome/browser/sync/protocol/service_constants.h" 12 #include "chrome/browser/sync/protocol/service_constants.h"
13 #include "chrome/browser/sync/sessions/status_controller.h" 13 #include "chrome/browser/sync/sessions/status_controller.h"
14 #include "chrome/browser/sync/syncable/directory_manager.h" 14 #include "chrome/browser/sync/syncable/directory_manager.h"
15 #include "chrome/browser/sync/syncable/syncable.h" 15 #include "chrome/browser/sync/syncable/syncable.h"
16 #include "chrome/browser/sync/util/character_set_converters.h" 16 #include "chrome/browser/sync/util/character_set_converters.h"
17 #include "chrome/browser/sync/util/event_sys-inl.h" 17 #include "chrome/browser/sync/util/event_sys-inl.h"
18 #include "chrome/browser/sync/util/path_helpers.h"
19 18
20 using std::map; 19 using std::map;
21 using std::set; 20 using std::set;
22 using syncable::BaseTransaction; 21 using syncable::BaseTransaction;
23 using syncable::Directory; 22 using syncable::Directory;
24 using syncable::Entry; 23 using syncable::Entry;
25 using syncable::Id; 24 using syncable::Id;
26 using syncable::MutableEntry; 25 using syncable::MutableEntry;
27 using syncable::ScopedDirLookup; 26 using syncable::ScopedDirLookup;
28 using syncable::WriteTransaction; 27 using syncable::WriteTransaction;
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 conflict_set_count_map_.erase(i++); 501 conflict_set_count_map_.erase(i++);
503 // METRIC self resolved conflict sets ++. 502 // METRIC self resolved conflict sets ++.
504 } else { 503 } else {
505 ++i; 504 ++i;
506 } 505 }
507 } 506 }
508 return rv; 507 return rv;
509 } 508 }
510 509
511 } // namespace browser_sync 510 } // namespace browser_sync
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/engine/syncer_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698