Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(698)

Side by Side Diff: components/sync/api/conflict_resolution.h

Issue 2240613002: [Sync] Convert sync to a static library. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Try getting rid of sync_core source set. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_API_CONFLICT_RESOLUTION_H_
6 #define COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_ 6 #define COMPONENTS_SYNC_API_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/api/entity_data.h"
11 11
12 namespace syncer_v2 { 12 namespace syncer_v2 {
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 SYNC_EXPORT 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
21 // removed. New entries must be added at the end, before TYPE_SIZE. 21 // removed. New entries must be added at the end, before TYPE_SIZE.
22 enum Type { 22 enum Type {
23 CHANGES_MATCH, // Exists for logging purposes. 23 CHANGES_MATCH, // Exists for logging purposes.
24 USE_LOCAL, 24 USE_LOCAL,
25 USE_REMOTE, 25 USE_REMOTE,
26 USE_NEW, 26 USE_NEW,
27 IGNORE_LOCAL_ENCRYPTION, // Exists for logging purposes. 27 IGNORE_LOCAL_ENCRYPTION, // Exists for logging purposes.
28 IGNORE_REMOTE_ENCRYPTION, // Exists for logging purposes. 28 IGNORE_REMOTE_ENCRYPTION, // Exists for logging purposes.
(...skipping 19 matching lines...) Expand all
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_v2 55 } // namespace syncer_v2
56 56
57 #endif // COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_ 57 #endif // COMPONENTS_SYNC_API_CONFLICT_RESOLUTION_H_
OLDNEW
« no previous file with comments | « components/sync/api/attachments/attachment_store_backend.h ('k') | components/sync/api/data_batch.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698