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/syncer_util.h" | 5 #include "sync/engine/syncer_util.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/location.h" | 12 #include "base/location.h" |
13 #include "base/metrics/histogram.h" | 13 #include "base/metrics/histogram.h" |
14 #include "chrome/browser/sync/engine/conflict_resolver.h" | 14 #include "sync/engine/conflict_resolver.h" |
15 #include "chrome/browser/sync/engine/nigori_util.h" | 15 #include "sync/engine/nigori_util.h" |
16 #include "chrome/browser/sync/engine/syncer_proto_util.h" | 16 #include "sync/engine/syncer_proto_util.h" |
17 #include "chrome/browser/sync/engine/syncer_types.h" | 17 #include "sync/engine/syncer_types.h" |
18 #include "chrome/browser/sync/engine/syncproto.h" | 18 #include "sync/engine/syncproto.h" |
19 #include "chrome/browser/sync/syncable/model_type.h" | |
20 #include "chrome/browser/sync/syncable/syncable.h" | |
21 #include "chrome/browser/sync/syncable/syncable_changes_version.h" | |
22 #include "chrome/browser/sync/util/cryptographer.h" | |
23 #include "chrome/browser/sync/util/time.h" | |
24 #include "sync/protocol/bookmark_specifics.pb.h" | 19 #include "sync/protocol/bookmark_specifics.pb.h" |
25 #include "sync/protocol/nigori_specifics.pb.h" | 20 #include "sync/protocol/nigori_specifics.pb.h" |
26 #include "sync/protocol/password_specifics.pb.h" | 21 #include "sync/protocol/password_specifics.pb.h" |
27 #include "sync/protocol/sync.pb.h" | 22 #include "sync/protocol/sync.pb.h" |
| 23 #include "sync/syncable/model_type.h" |
| 24 #include "sync/syncable/syncable.h" |
| 25 #include "sync/syncable/syncable_changes_version.h" |
| 26 #include "sync/util/cryptographer.h" |
| 27 #include "sync/util/time.h" |
28 | 28 |
29 using syncable::BASE_VERSION; | 29 using syncable::BASE_VERSION; |
30 using syncable::Blob; | 30 using syncable::Blob; |
31 using syncable::CHANGES_VERSION; | 31 using syncable::CHANGES_VERSION; |
32 using syncable::CREATE; | 32 using syncable::CREATE; |
33 using syncable::CREATE_NEW_UPDATE_ITEM; | 33 using syncable::CREATE_NEW_UPDATE_ITEM; |
34 using syncable::CTIME; | 34 using syncable::CTIME; |
35 using syncable::Directory; | 35 using syncable::Directory; |
36 using syncable::Entry; | 36 using syncable::Entry; |
37 using syncable::GetModelTypeFromSpecifics; | 37 using syncable::GetModelTypeFromSpecifics; |
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
769 if (update.version() < target->Get(SERVER_VERSION)) { | 769 if (update.version() < target->Get(SERVER_VERSION)) { |
770 LOG(WARNING) << "Update older than current server version for " | 770 LOG(WARNING) << "Update older than current server version for " |
771 << *target << " Update:" | 771 << *target << " Update:" |
772 << SyncerProtoUtil::SyncEntityDebugString(update); | 772 << SyncerProtoUtil::SyncEntityDebugString(update); |
773 return VERIFY_SUCCESS; // Expected in new sync protocol. | 773 return VERIFY_SUCCESS; // Expected in new sync protocol. |
774 } | 774 } |
775 return VERIFY_UNDECIDED; | 775 return VERIFY_UNDECIDED; |
776 } | 776 } |
777 | 777 |
778 } // namespace browser_sync | 778 } // namespace browser_sync |
OLD | NEW |