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

Unified Diff: chrome/browser/sync/engine/build_and_process_conflict_sets_command.h

Issue 9107055: Remove single direction conflict set code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pre-emptive rebase Created 8 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/build_and_process_conflict_sets_command.h
diff --git a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h
index 1ae090dfd1de8c739ab1c7a5fc1a9add5f14e305..99f130d53e104629af851cbba4484a2a13a894c9 100644
--- a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h
+++ b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h
@@ -43,25 +43,9 @@ class BuildAndProcessConflictSetsCommand : public ModelChangingSyncerCommand {
sessions::SyncSession* session) OVERRIDE;
private:
- bool BuildAndProcessConflictSets(sessions::SyncSession* session);
-
- bool ProcessSingleDirectionConflictSets(
- syncable::WriteTransaction* trans, ConflictResolver* resolver,
- Cryptographer* cryptographer, sessions::StatusController* status,
- const ModelSafeRoutingInfo& routes);
- bool ApplyUpdatesTransactionally(
- syncable::WriteTransaction* trans,
- const std::vector<syncable::Id>* const update_set,
- ConflictResolver* resolver,
- Cryptographer* cryptographer,
- const ModelSafeRoutingInfo& routes,
- sessions::StatusController* status);
void BuildConflictSets(syncable::BaseTransaction* trans,
sessions::ConflictProgress* conflict_progress);
- void MergeSetsForNameClash(syncable::BaseTransaction* trans,
- syncable::Entry* entry,
- sessions::ConflictProgress* conflict_progress);
void MergeSetsForIntroducedLoops(syncable::BaseTransaction* trans,
syncable::Entry* entry,
sessions::ConflictProgress* conflict_progress);
« no previous file with comments | « no previous file | chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698