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 "components/sync/engine_impl/conflict_util.h" | 5 #include "components/sync/engine_impl/conflict_util.h" |
6 | 6 |
7 #include "components/sync/syncable/mutable_entry.h" | 7 #include "components/sync/syncable/mutable_entry.h" |
8 | 8 |
9 namespace syncer { | 9 namespace syncer { |
10 | 10 |
11 using syncable::MutableEntry; | 11 using syncer::syncable::MutableEntry; |
12 | 12 |
13 namespace conflict_util { | 13 namespace conflict_util { |
14 | 14 |
15 // Allow the server's changes to take precedence. | 15 // Allow the server's changes to take precedence. |
16 // This will take effect during the next ApplyUpdates step. | 16 // This will take effect during the next ApplyUpdates step. |
17 void IgnoreLocalChanges(MutableEntry* entry) { | 17 void IgnoreLocalChanges(MutableEntry* entry) { |
18 DCHECK(entry->GetIsUnsynced()); | 18 DCHECK(entry->GetIsUnsynced()); |
19 DCHECK(entry->GetIsUnappliedUpdate()); | 19 DCHECK(entry->GetIsUnappliedUpdate()); |
20 entry->PutIsUnsynced(false); | 20 entry->PutIsUnsynced(false); |
21 } | 21 } |
(...skipping 18 matching lines...) Expand all Loading... |
40 // required (and hence there will be many encryption conflicts). | 40 // required (and hence there will be many encryption conflicts). |
41 DCHECK(entry->GetIsUnsynced()); | 41 DCHECK(entry->GetIsUnsynced()); |
42 DCHECK(entry->GetIsUnappliedUpdate()); | 42 DCHECK(entry->GetIsUnappliedUpdate()); |
43 entry->PutBaseVersion(entry->GetServerVersion()); | 43 entry->PutBaseVersion(entry->GetServerVersion()); |
44 entry->PutIsUnappliedUpdate(false); | 44 entry->PutIsUnappliedUpdate(false); |
45 entry->PutIsUnsynced(false); | 45 entry->PutIsUnsynced(false); |
46 } | 46 } |
47 | 47 |
48 } // namespace conflict_util | 48 } // namespace conflict_util |
49 } // namespace syncer | 49 } // namespace syncer |
OLD | NEW |