diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 02:01:12 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 02:01:12 +0000 |
| commit | 00cf51c636d068e712242c51dba0d796381033db (patch) | |
| tree | c58b20a1b4480f0fd7b3ea34510a25be41242a2e /sync/engine/conflict_util.h | |
| parent | a0474adb323a320f8d0b509fbd04c0df425883e5 (diff) | |
| download | chromium_src-00cf51c636d068e712242c51dba0d796381033db.zip chromium_src-00cf51c636d068e712242c51dba0d796381033db.tar.gz chromium_src-00cf51c636d068e712242c51dba0d796381033db.tar.bz2 | |
sync: wrap conflict_utils in a namespace
This makes it easier to hunt down function definitions and matches file hierarchy as suggested by the style guide.
BUG=
Review URL: https://chromiumcodereview.appspot.com/11238043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/conflict_util.h')
| -rw-r--r-- | sync/engine/conflict_util.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sync/engine/conflict_util.h b/sync/engine/conflict_util.h index 7242dd6..0f3a58b 100644 --- a/sync/engine/conflict_util.h +++ b/sync/engine/conflict_util.h @@ -13,6 +13,8 @@ namespace syncable { class MutableEntry; } +namespace conflict_util { + // 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); @@ -26,6 +28,7 @@ void OverwriteServerChanges(syncable::MutableEntry* entry); // into a conflicting state. void IgnoreConflict(syncable::MutableEntry *trans); +} // namespace conflict_util } // namespace syncer #endif // SYNC_ENGINE_CONFLICT_UTIL_H_ |