| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/syncer_util.h" | 5 #include "chrome/browser/sync/engine/syncer_util.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "chrome/browser/sync/engine/conflict_resolver.h" | 11 #include "chrome/browser/sync/engine/conflict_resolver.h" |
| 12 #include "chrome/browser/sync/engine/syncer_proto_util.h" | 12 #include "chrome/browser/sync/engine/syncer_proto_util.h" |
| 13 #include "chrome/browser/sync/engine/syncer_types.h" | 13 #include "chrome/browser/sync/engine/syncer_types.h" |
| 14 #include "chrome/browser/sync/engine/syncproto.h" | 14 #include "chrome/browser/sync/engine/syncproto.h" |
| 15 #include "chrome/browser/sync/syncable/directory_manager.h" | 15 #include "chrome/browser/sync/syncable/directory_manager.h" |
| 16 #include "chrome/browser/sync/syncable/syncable.h" | 16 #include "chrome/browser/sync/syncable/syncable.h" |
| 17 #include "chrome/browser/sync/syncable/syncable_changes_version.h" | 17 #include "chrome/browser/sync/syncable/syncable_changes_version.h" |
| 18 #include "chrome/browser/sync/util/path_helpers.h" | |
| 19 #include "chrome/browser/sync/util/sync_types.h" | 18 #include "chrome/browser/sync/util/sync_types.h" |
| 20 | 19 |
| 21 using syncable::BASE_VERSION; | 20 using syncable::BASE_VERSION; |
| 22 using syncable::BOOKMARK_FAVICON; | 21 using syncable::BOOKMARK_FAVICON; |
| 23 using syncable::BOOKMARK_URL; | 22 using syncable::BOOKMARK_URL; |
| 24 using syncable::Blob; | 23 using syncable::Blob; |
| 25 using syncable::CHANGES_VERSION; | 24 using syncable::CHANGES_VERSION; |
| 26 using syncable::CREATE; | 25 using syncable::CREATE; |
| 27 using syncable::CREATE_NEW_UPDATE_ITEM; | 26 using syncable::CREATE_NEW_UPDATE_ITEM; |
| 28 using syncable::CTIME; | 27 using syncable::CTIME; |
| (...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 743 | 742 |
| 744 // |update_entry| is considered to be somewhere after |candidate|, so store | 743 // |update_entry| is considered to be somewhere after |candidate|, so store |
| 745 // it as the upper bound. | 744 // it as the upper bound. |
| 746 closest_sibling = candidate.Get(ID); | 745 closest_sibling = candidate.Get(ID); |
| 747 } | 746 } |
| 748 | 747 |
| 749 return closest_sibling; | 748 return closest_sibling; |
| 750 } | 749 } |
| 751 | 750 |
| 752 } // namespace browser_sync | 751 } // namespace browser_sync |
| OLD | NEW |