| 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 "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 "sync/engine/syncer_util.h" | 10 #include "sync/engine/syncer_util.h" |
| 11 #include "sync/sessions/session_state.h" | 11 #include "sync/sessions/session_state.h" |
| 12 #include "sync/syncable/entry.h" | 12 #include "sync/syncable/entry.h" |
| 13 #include "sync/syncable/mutable_entry.h" | 13 #include "sync/syncable/mutable_entry.h" |
| 14 #include "sync/syncable/syncable_id.h" | 14 #include "sync/syncable/syncable_id.h" |
| 15 #include "sync/syncable/write_transaction.h" | 15 #include "sync/syncable/write_transaction.h" |
| 16 | 16 |
| 17 using std::vector; | 17 using std::vector; |
| 18 | 18 |
| 19 namespace csync { | 19 namespace syncer { |
| 20 | 20 |
| 21 UpdateApplicator::UpdateApplicator(ConflictResolver* resolver, | 21 UpdateApplicator::UpdateApplicator(ConflictResolver* resolver, |
| 22 Cryptographer* cryptographer, | 22 Cryptographer* cryptographer, |
| 23 const UpdateIterator& begin, | 23 const UpdateIterator& begin, |
| 24 const UpdateIterator& end, | 24 const UpdateIterator& end, |
| 25 const ModelSafeRoutingInfo& routes, | 25 const ModelSafeRoutingInfo& routes, |
| 26 ModelSafeGroup group_filter) | 26 ModelSafeGroup group_filter) |
| 27 : resolver_(resolver), | 27 : resolver_(resolver), |
| 28 cryptographer_(cryptographer), | 28 cryptographer_(cryptographer), |
| 29 begin_(begin), | 29 begin_(begin), |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 void UpdateApplicator::ResultTracker::ClearConflicts() { | 182 void UpdateApplicator::ResultTracker::ClearConflicts() { |
| 183 conflicting_ids_.clear(); | 183 conflicting_ids_.clear(); |
| 184 encryption_conflict_ids_.clear(); | 184 encryption_conflict_ids_.clear(); |
| 185 hierarchy_conflict_ids_.clear(); | 185 hierarchy_conflict_ids_.clear(); |
| 186 } | 186 } |
| 187 | 187 |
| 188 bool UpdateApplicator::ResultTracker::no_conflicts() const { | 188 bool UpdateApplicator::ResultTracker::no_conflicts() const { |
| 189 return conflicting_ids_.empty(); | 189 return conflicting_ids_.empty(); |
| 190 } | 190 } |
| 191 | 191 |
| 192 } // namespace csync | 192 } // namespace syncer |
| OLD | NEW |