Chromium Code Reviews| Index: sync/engine/build_commit_command.cc |
| diff --git a/sync/engine/build_commit_command.cc b/sync/engine/build_commit_command.cc |
| index 8e51ddb530a0e8a49072c5157285bf08413f2468..d105341130c93d7d8651a9ae225ac4738835934a 100644 |
| --- a/sync/engine/build_commit_command.cc |
| +++ b/sync/engine/build_commit_command.cc |
| @@ -22,6 +22,11 @@ |
| #include "sync/syncable/write_transaction.h" |
| #include "sync/util/time.h" |
| +//Todo(vishwath) Remove this include after node positions have |
|
akalin
2012/10/05 00:57:59
TODO(vishwath):
vishwath
2012/10/05 18:34:49
Done.
|
| +// shifted to completely uing Ordinals. |
|
akalin
2012/10/05 00:57:59
uing -> using
vishwath
2012/10/05 18:34:49
Done.
|
| +// See crbug.com/145412 |
|
akalin
2012/10/05 00:57:59
prepend http:// to URL (to make it clickable)
als
vishwath
2012/10/05 18:34:49
Done.
|
| +#include "sync/internal_api/public/base/node_ordinal.h" |
| + |
| using std::set; |
| using std::string; |
| using std::vector; |
| @@ -31,7 +36,7 @@ namespace syncer { |
| using sessions::SyncSession; |
| using syncable::Entry; |
| using syncable::IS_DEL; |
| -using syncable::SERVER_POSITION_IN_PARENT; |
| +using syncable::SERVER_ORDINAL_IN_PARENT; |
| using syncable::IS_UNAPPLIED_UPDATE; |
| using syncable::IS_UNSYNCED; |
| using syncable::Id; |
| @@ -231,7 +236,7 @@ int64 BuildCommitCommand::FindAnchorPosition(syncable::IdField direction, |
| syncable::GET_BY_ID, |
| next_id); |
| if (!next_entry.Get(IS_UNSYNCED) && !next_entry.Get(IS_UNAPPLIED_UPDATE)) { |
| - return next_entry.Get(SERVER_POSITION_IN_PARENT); |
| + return NodeOrdinalToInt64(next_entry.Get(SERVER_ORDINAL_IN_PARENT)); |
| } |
| next_id = next_entry.Get(direction); |
| } |