diff options
| author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 02:35:15 +0000 |
|---|---|---|
| committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 02:35:15 +0000 |
| commit | 2a6edab9c655bf0cb32e1172e3a7a745c858e565 (patch) | |
| tree | 31e1ccb6082a9c3d2cb33a4c81ec79f25c049ee7 /sync/engine/conflict_util.h | |
| parent | 12849f68e19b94e3e97fa4276fce61a6aff98ec6 (diff) | |
| download | chromium_src-2a6edab9c655bf0cb32e1172e3a7a745c858e565.zip chromium_src-2a6edab9c655bf0cb32e1172e3a7a745c858e565.tar.gz chromium_src-2a6edab9c655bf0cb32e1172e3a7a745c858e565.tar.bz2 | |
sync: Don't use ConflictProgress in the resolver
Remove all references to the ConflictProgress struct from the place
where it is needed most: the ConflictResolver. It turns out that the
ConflictResolver's only relevant input is a set of simple conflict IDs,
and it has no need for the rest of the ConflictProgress struct.
This change is a step towards the removal of the ConflictProgress
struct, which will eventually allow us to improve the way that the
syncer handles conflicts.
This commit also cleans up some includes and forward declarations in the
conflict resolver.
BUG=147681
Review URL: https://chromiumcodereview.appspot.com/10989087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/conflict_util.h')
| -rw-r--r-- | sync/engine/conflict_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sync/engine/conflict_util.h b/sync/engine/conflict_util.h index c3efa5e..7242dd6 100644 --- a/sync/engine/conflict_util.h +++ b/sync/engine/conflict_util.h @@ -7,12 +7,12 @@ #ifndef SYNC_ENGINE_CONFLICT_UTIL_H_ #define SYNC_ENGINE_CONFLICT_UTIL_H_ +namespace syncer { + namespace syncable { class MutableEntry; } -namespace syncer { - // Marks the item as no longer requiring sync, allowing the server's version // to 'win' during the next update application step. void IgnoreLocalChanges(syncable::MutableEntry* entry); |