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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/engine/conflict_resolver.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/apply_updates_command.cc ('K') | « sync/engine/apply_updates_command.cc ('k') | sync/engine/conflict_resolver.cc » ('j') | sync/engine/syncer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/conflict_resolver.h
diff --git a/sync/engine/conflict_resolver.h b/sync/engine/conflict_resolver.h
index d2d89d099c65e9faae2bba6fd30a047cb34effba..e655d5c0748afbb1bf10a160469db7be256b09a5 100644
--- a/sync/engine/conflict_resolver.h
+++ b/sync/engine/conflict_resolver.h
@@ -66,10 +66,6 @@ class ConflictResolver {
SYNC_PROGRESS, // Progress made.
};
- void IgnoreLocalChanges(syncable::MutableEntry* entry);
- void OverwriteServerChanges(syncable::WriteTransaction* trans,
- syncable::MutableEntry* entry);
-
ProcessSimpleConflictResult ProcessSimpleConflict(
syncable::WriteTransaction* trans,
const syncable::Id& id,
« sync/engine/apply_updates_command.cc ('K') | « sync/engine/apply_updates_command.cc ('k') | sync/engine/conflict_resolver.cc » ('j') | sync/engine/syncer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698