OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/api/conflict_resolution.h" | 5 #include "components/sync/model/conflict_resolution.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 namespace syncer { | 9 namespace syncer { |
10 | 10 |
11 // static | 11 // static |
12 ConflictResolution ConflictResolution::UseLocal() { | 12 ConflictResolution ConflictResolution::UseLocal() { |
13 return ConflictResolution(USE_LOCAL, nullptr); | 13 return ConflictResolution(USE_LOCAL, nullptr); |
14 } | 14 } |
15 | 15 |
(...skipping 18 matching lines...) Expand all Loading... |
34 // Has data if and only if type is USE_NEW. | 34 // Has data if and only if type is USE_NEW. |
35 DCHECK((type_ == USE_NEW) == !!data_); | 35 DCHECK((type_ == USE_NEW) == !!data_); |
36 return std::move(data_); | 36 return std::move(data_); |
37 } | 37 } |
38 | 38 |
39 ConflictResolution::ConflictResolution(Type type, | 39 ConflictResolution::ConflictResolution(Type type, |
40 std::unique_ptr<EntityData> data) | 40 std::unique_ptr<EntityData> data) |
41 : type_(type), data_(std::move(data)) {} | 41 : type_(type), data_(std::move(data)) {} |
42 | 42 |
43 } // namespace syncer | 43 } // namespace syncer |
OLD | NEW |