OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/sync/engine/build_commit_command.h" | 5 #include "sync/engine/build_commit_command.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/string_util.h" | 12 #include "base/string_util.h" |
13 #include "chrome/browser/sync/engine/syncer_proto_util.h" | 13 #include "sync/engine/syncer_proto_util.h" |
14 #include "chrome/browser/sync/sessions/sync_session.h" | |
15 #include "chrome/browser/sync/syncable/syncable.h" | |
16 #include "chrome/browser/sync/syncable/syncable_changes_version.h" | |
17 #include "chrome/browser/sync/util/time.h" | |
18 #include "sync/protocol/bookmark_specifics.pb.h" | 14 #include "sync/protocol/bookmark_specifics.pb.h" |
| 15 #include "sync/sessions/sync_session.h" |
| 16 #include "sync/syncable/syncable.h" |
| 17 #include "sync/syncable/syncable_changes_version.h" |
| 18 #include "sync/util/time.h" |
19 | 19 |
20 using std::set; | 20 using std::set; |
21 using std::string; | 21 using std::string; |
22 using std::vector; | 22 using std::vector; |
23 using syncable::Entry; | 23 using syncable::Entry; |
24 using syncable::IS_DEL; | 24 using syncable::IS_DEL; |
25 using syncable::SERVER_POSITION_IN_PARENT; | 25 using syncable::SERVER_POSITION_IN_PARENT; |
26 using syncable::IS_UNAPPLIED_UPDATE; | 26 using syncable::IS_UNAPPLIED_UPDATE; |
27 using syncable::IS_UNSYNCED; | 27 using syncable::IS_UNSYNCED; |
28 using syncable::Id; | 28 using syncable::Id; |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
246 if (delta <= static_cast<uint64>(GetGap()*2)) | 246 if (delta <= static_cast<uint64>(GetGap()*2)) |
247 return lo + (static_cast<int64>(delta) + 7) / 8; // Interpolate. | 247 return lo + (static_cast<int64>(delta) + 7) / 8; // Interpolate. |
248 else if (lo == GetFirstPosition()) | 248 else if (lo == GetFirstPosition()) |
249 return hi - GetGap(); // Extend range just before successor. | 249 return hi - GetGap(); // Extend range just before successor. |
250 else | 250 else |
251 return lo + GetGap(); // Use or extend range just after predecessor. | 251 return lo + GetGap(); // Use or extend range just after predecessor. |
252 } | 252 } |
253 | 253 |
254 | 254 |
255 } // namespace browser_sync | 255 } // namespace browser_sync |
OLD | NEW |