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 #include "chrome/browser/sync/engine/update_applicator.h" | 5 #include "sync/engine/update_applicator.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "chrome/browser/sync/engine/syncer_util.h" | 10 #include "sync/engine/syncer_util.h" |
11 #include "chrome/browser/sync/sessions/session_state.h" | 11 #include "sync/sessions/session_state.h" |
12 #include "chrome/browser/sync/syncable/syncable.h" | 12 #include "sync/syncable/syncable.h" |
13 #include "chrome/browser/sync/syncable/syncable_id.h" | 13 #include "sync/syncable/syncable_id.h" |
14 | 14 |
15 using std::vector; | 15 using std::vector; |
16 | 16 |
17 namespace browser_sync { | 17 namespace browser_sync { |
18 | 18 |
19 UpdateApplicator::UpdateApplicator(ConflictResolver* resolver, | 19 UpdateApplicator::UpdateApplicator(ConflictResolver* resolver, |
20 Cryptographer* cryptographer, | 20 Cryptographer* cryptographer, |
21 const UpdateIterator& begin, | 21 const UpdateIterator& begin, |
22 const UpdateIterator& end, | 22 const UpdateIterator& end, |
23 const ModelSafeRoutingInfo& routes, | 23 const ModelSafeRoutingInfo& routes, |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 conflicting_ids_.clear(); | 181 conflicting_ids_.clear(); |
182 encryption_conflict_ids_.clear(); | 182 encryption_conflict_ids_.clear(); |
183 hierarchy_conflict_ids_.clear(); | 183 hierarchy_conflict_ids_.clear(); |
184 } | 184 } |
185 | 185 |
186 bool UpdateApplicator::ResultTracker::no_conflicts() const { | 186 bool UpdateApplicator::ResultTracker::no_conflicts() const { |
187 return conflicting_ids_.empty(); | 187 return conflicting_ids_.empty(); |
188 } | 188 } |
189 | 189 |
190 } // namespace browser_sync | 190 } // namespace browser_sync |
OLD | NEW |