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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/engine/syncer.h

Issue 11192071: sync: Merge apply updates and resolve conflicts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« sync/engine/conflict_resolver.cc ('K') | « sync/engine/sync_scheduler_unittest.cc ('k') | sync/engine/syncer.cc » ('j') | sync/engine/syncer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/syncer.h
diff --git a/sync/engine/syncer.h b/sync/engine/syncer.h
index 3c4c68ecaef9d94f867102c5f5cc43d283f3bf49..ee97b08c438e87cbdff8712f3010ef5375f4a571 100644
--- a/sync/engine/syncer.h
+++ b/sync/engine/syncer.h
@@ -31,8 +31,6 @@ enum SyncerStep {
STORE_TIMESTAMPS,
APPLY_UPDATES,
COMMIT,
- RESOLVE_CONFLICTS,
- APPLY_UPDATES_TO_RESOLVE_CONFLICTS,
SYNCER_END
};
« sync/engine/conflict_resolver.cc ('K') | « sync/engine/sync_scheduler_unittest.cc ('k') | sync/engine/syncer.cc » ('j') | sync/engine/syncer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698