OLD | NEW |
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 SYNC_API_SYNC_MERGE_RESULT_H_ | 5 #ifndef COMPONENTS_SYNC_API_SYNC_MERGE_RESULT_H_ |
6 #define 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 "sync/api/sync_error.h" | 10 #include "components/sync/api/sync_error.h" |
11 #include "sync/base/sync_export.h" | 11 #include "components/sync/base/model_type.h" |
12 #include "sync/internal_api/public/base/model_type.h" | 12 #include "components/sync/base/sync_export.h" |
13 | 13 |
14 namespace syncer { | 14 namespace syncer { |
15 | 15 |
16 // A model-type-specific view of a sync merge. This class encapsulates the | 16 // 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 | 17 // state before and after the merge as well as the deltas and any error that |
18 // occurred. | 18 // occurred. |
19 // Note: This class only tracks one side of the merge. In other words, if built | 19 // 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 | 20 // 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 | 21 // and after merging, and the delta's applied to that state. Sync's change |
22 // processor will create a separate merge result. | 22 // processor will create a separate merge result. |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 int num_items_added_; | 71 int num_items_added_; |
72 int num_items_deleted_; | 72 int num_items_deleted_; |
73 int num_items_modified_; | 73 int num_items_modified_; |
74 | 74 |
75 // Version of model before association. | 75 // Version of model before association. |
76 int64_t pre_association_version_; | 76 int64_t pre_association_version_; |
77 }; | 77 }; |
78 | 78 |
79 } // namespace syncer | 79 } // namespace syncer |
80 | 80 |
81 #endif // SYNC_API_SYNC_MERGE_RESULT_H_ | 81 #endif // COMPONENTS_SYNC_API_SYNC_MERGE_RESULT_H_ |
OLD | NEW |