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

Side by Side Diff: components/sync/api/sync_merge_result.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
« no previous file with comments | « components/sync/api/sync_error_factory.h ('k') | components/sync/api/syncable_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef COMPONENTS_SYNC_API_SYNC_MERGE_RESULT_H_ 5 #ifndef COMPONENTS_SYNC_API_SYNC_MERGE_RESULT_H_
6 #define COMPONENTS_SYNC_API_SYNC_MERGE_RESULT_H_ 6 #define COMPONENTS_SYNC_API_SYNC_MERGE_RESULT_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "components/sync/api/sync_error.h" 10 #include "components/sync/api/sync_error.h"
11 #include "components/sync/base/model_type.h" 11 #include "components/sync/base/model_type.h"
12 #include "components/sync/base/sync_export.h"
13 12
14 namespace syncer { 13 namespace syncer {
15 14
16 // A model-type-specific view of a sync merge. This class encapsulates the 15 // A model-type-specific view of a sync merge. This class encapsulates the
17 // state before and after the merge as well as the deltas and any error that 16 // state before and after the merge as well as the deltas and any error that
18 // occurred. 17 // occurred.
19 // Note: This class only tracks one side of the merge. In other words, if built 18 // Note: This class only tracks one side of the merge. In other words, if built
20 // by the local SyncableService, all values correspond to the local state before 19 // by the local SyncableService, all values correspond to the local state before
21 // and after merging, and the delta's applied to that state. Sync's change 20 // and after merging, and the delta's applied to that state. Sync's change
22 // processor will create a separate merge result. 21 // processor will create a separate merge result.
23 class SYNC_EXPORT SyncMergeResult { 22 class SyncMergeResult {
24 public: 23 public:
25 // Initialize an empty merge result for model type |type|. 24 // Initialize an empty merge result for model type |type|.
26 explicit SyncMergeResult(ModelType type); 25 explicit SyncMergeResult(ModelType type);
27 SyncMergeResult(const SyncMergeResult& other); 26 SyncMergeResult(const SyncMergeResult& other);
28 ~SyncMergeResult(); 27 ~SyncMergeResult();
29 28
30 // Default copy and assign welcome. 29 // Default copy and assign welcome.
31 30
32 // Setters. 31 // Setters.
33 // Note: if |error.IsSet()| is true, |error.type()| must match model_type_ 32 // Note: if |error.IsSet()| is true, |error.type()| must match model_type_
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 int num_items_deleted_; 71 int num_items_deleted_;
73 int num_items_modified_; 72 int num_items_modified_;
74 73
75 // Version of model before association. 74 // Version of model before association.
76 int64_t pre_association_version_; 75 int64_t pre_association_version_;
77 }; 76 };
78 77
79 } // namespace syncer 78 } // namespace syncer
80 79
81 #endif // COMPONENTS_SYNC_API_SYNC_MERGE_RESULT_H_ 80 #endif // COMPONENTS_SYNC_API_SYNC_MERGE_RESULT_H_
OLDNEW
« no previous file with comments | « components/sync/api/sync_error_factory.h ('k') | components/sync/api/syncable_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698