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

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

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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
« no previous file with comments | « sync/api/attachments/attachment_unittest.cc ('k') | sync/api/conflict_resolution.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
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
3 // found in the LICENSE file.
4
5 #ifndef SYNC_API_CONFLICT_RESOLUTION_H_
6 #define SYNC_API_CONFLICT_RESOLUTION_H_
7
8 #include <memory>
9
10 #include "sync/api/entity_data.h"
11
12 namespace syncer_v2 {
13
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.
16 // 2) Use the remote server data and update the client.
17 // 3) Use newly created data and update both.
18 class SYNC_EXPORT ConflictResolution {
19 public:
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.
22 enum Type {
23 CHANGES_MATCH, // Exists for logging purposes.
24 USE_LOCAL,
25 USE_REMOTE,
26 USE_NEW,
27 IGNORE_LOCAL_ENCRYPTION, // Exists for logging purposes.
28 IGNORE_REMOTE_ENCRYPTION, // Exists for logging purposes.
29 TYPE_SIZE,
30 };
31
32 // Convenience functions for brevity.
33 static ConflictResolution UseLocal();
34 static ConflictResolution UseRemote();
35 static ConflictResolution UseNew(std::unique_ptr<EntityData> data);
36
37 // Move constructor since we can't copy a unique_ptr.
38 ConflictResolution(ConflictResolution&& other);
39 ~ConflictResolution();
40
41 Type type() const { return type_; }
42
43 // Get the data for USE_NEW, or nullptr. Can only be called once.
44 std::unique_ptr<EntityData> ExtractData();
45
46 private:
47 ConflictResolution(Type type, std::unique_ptr<EntityData> data);
48
49 const Type type_;
50 std::unique_ptr<EntityData> data_;
51
52 DISALLOW_COPY_AND_ASSIGN(ConflictResolution);
53 };
54
55 } // namespace syncer_v2
56
57 #endif // SYNC_API_CONFLICT_RESOLUTION_H_
OLDNEW
« no previous file with comments | « sync/api/attachments/attachment_unittest.cc ('k') | sync/api/conflict_resolution.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698