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

Side by Side Diff: components/sync/model/sync_merge_result.h

Issue 2401223002: [Sync] Renaming sync/api* to sync/model*. (Closed)
Patch Set: Missed a comment in a DEPS file, and rebasing. Created 4 years, 2 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 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_MODEL_SYNC_MERGE_RESULT_H_
6 #define COMPONENTS_SYNC_API_SYNC_MERGE_RESULT_H_ 6 #define COMPONENTS_SYNC_MODEL_SYNC_MERGE_RESULT_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "components/sync/api/sync_error.h"
11 #include "components/sync/base/model_type.h" 10 #include "components/sync/base/model_type.h"
11 #include "components/sync/model/sync_error.h"
12 12
13 namespace syncer { 13 namespace syncer {
14 14
15 // 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
16 // 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
17 // occurred. 17 // occurred.
18 // 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
19 // 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
20 // 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
21 // processor will create a separate merge result. 21 // processor will create a separate merge result.
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 int num_items_added_; 70 int num_items_added_;
71 int num_items_deleted_; 71 int num_items_deleted_;
72 int num_items_modified_; 72 int num_items_modified_;
73 73
74 // Version of model before association. 74 // Version of model before association.
75 int64_t pre_association_version_; 75 int64_t pre_association_version_;
76 }; 76 };
77 77
78 } // namespace syncer 78 } // namespace syncer
79 79
80 #endif // COMPONENTS_SYNC_API_SYNC_MERGE_RESULT_H_ 80 #endif // COMPONENTS_SYNC_MODEL_SYNC_MERGE_RESULT_H_
OLDNEW
« no previous file with comments | « components/sync/model/sync_error_unittest.cc ('k') | components/sync/model/sync_merge_result.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698