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 #ifndef COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_ | 5 #ifndef COMPONENTS_SYNC_MODEL_CONFLICT_RESOLUTION_H_ |
6 #define COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_ | 6 #define COMPONENTS_SYNC_MODEL_CONFLICT_RESOLUTION_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 | 9 |
10 #include "components/sync/api/entity_data.h" | 10 #include "components/sync/model/entity_data.h" |
11 | 11 |
12 namespace syncer { | 12 namespace syncer { |
13 | 13 |
14 // A simple class to represent the resolution of a data conflict. We either: | 14 // A simple class to represent the resolution of a data conflict. We either: |
15 // 1) Use the local client data and update the server. | 15 // 1) Use the local client data and update the server. |
16 // 2) Use the remote server data and update the client. | 16 // 2) Use the remote server data and update the client. |
17 // 3) Use newly created data and update both. | 17 // 3) Use newly created data and update both. |
18 class ConflictResolution { | 18 class ConflictResolution { |
19 public: | 19 public: |
20 // This enum is used in histograms.xml and entries shouldn't be renumbered or | 20 // This enum is used in histograms.xml and entries shouldn't be renumbered or |
(...skipping 26 matching lines...) Expand all Loading... |
47 ConflictResolution(Type type, std::unique_ptr<EntityData> data); | 47 ConflictResolution(Type type, std::unique_ptr<EntityData> data); |
48 | 48 |
49 const Type type_; | 49 const Type type_; |
50 std::unique_ptr<EntityData> data_; | 50 std::unique_ptr<EntityData> data_; |
51 | 51 |
52 DISALLOW_COPY_AND_ASSIGN(ConflictResolution); | 52 DISALLOW_COPY_AND_ASSIGN(ConflictResolution); |
53 }; | 53 }; |
54 | 54 |
55 } // namespace syncer | 55 } // namespace syncer |
56 | 56 |
57 #endif // COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_ | 57 #endif // COMPONENTS_SYNC_MODEL_CONFLICT_RESOLUTION_H_ |
OLD | NEW |