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

Unified Diff: sync/engine/get_commit_ids_command.cc

Issue 11636006: WIP: The Bookmark Position Megapatch (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Various updates, including switch suffix to unique_client_tag style Created 8 years 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 | « sync/engine/conflict_resolver.cc ('k') | sync/engine/process_commit_response_command.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/get_commit_ids_command.cc
diff --git a/sync/engine/get_commit_ids_command.cc b/sync/engine/get_commit_ids_command.cc
index bb6d22858de7d41fb682893fe5cffd137cfff8cd..9e45a1f2561d6789e8d6e3def65160cf59bca1a6 100644
--- a/sync/engine/get_commit_ids_command.cc
+++ b/sync/engine/get_commit_ids_command.cc
@@ -248,7 +248,7 @@ bool GetCommitIdsCommand::AddItemThenPredecessors(
if (item.Get(syncable::IS_DEL))
return true; // Deleted items have no predecessors.
- syncable::Id prev_id = item.Get(syncable::PREV_ID);
+ syncable::Id prev_id = item.GetPredecessorId();
while (!prev_id.IsRoot()) {
syncable::Entry prev(trans, syncable::GET_BY_ID, prev_id);
CHECK(prev.good()) << "Bad id when walking predecessors.";
@@ -262,7 +262,7 @@ bool GetCommitIdsCommand::AddItemThenPredecessors(
}
if (!AddItem(ready_unsynced_set, prev, result))
return false; // Item is in conflict.
- prev_id = prev.Get(syncable::PREV_ID);
+ prev_id = prev.GetPredecessorId();
}
return true;
}
« no previous file with comments | « sync/engine/conflict_resolver.cc ('k') | sync/engine/process_commit_response_command.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698