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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/engine/syncer_util.h

Issue 10559104: sync: Process 'control' data separately (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update patch. Still draft quality. Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« sync/engine/syncer.cc ('K') | « sync/engine/syncer.cc ('k') | sync/engine/syncer_util.cc » ('j') | sync/internal_api/public/engine/model_safe_worker.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/syncer_util.h
diff --git a/sync/engine/syncer_util.h b/sync/engine/syncer_util.h
index 546ac3ff1ef2c3cf0c678ef8bcf231bc170afd4b..be14e5c8223fd35e24baf869f3f1d51c1d866b5a 100644
--- a/sync/engine/syncer_util.h
+++ b/sync/engine/syncer_util.h
@@ -68,6 +68,10 @@ class SyncerUtil {
static void UpdateLocalDataFromServerData(syncable::WriteTransaction* trans,
syncable::MutableEntry* entry);
+ static void IgnoreLocalChanges(syncable::MutableEntry* entry);
+ static void OverwriteServerChanges(syncable::MutableEntry* entry);
+ static void IgnoreConflict(syncable::MutableEntry *trans);
+
static VerifyCommitResult ValidateCommitEntry(syncable::Entry* entry);
static VerifyResult VerifyNewEntry(const SyncEntity& update,
« sync/engine/syncer.cc ('K') | « sync/engine/syncer.cc ('k') | sync/engine/syncer_util.cc » ('j') | sync/internal_api/public/engine/model_safe_worker.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698