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

Side by Side Diff: components/sync/engine_impl/syncer_util.cc

Issue 2387553002: [Sync] Removing duplicated includes between cc and h files. (Closed)
Patch Set: Fixing DataTypeStatusTable Created 4 years, 2 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "components/sync/engine_impl/syncer_util.h" 5 #include "components/sync/engine_impl/syncer_util.h"
6 6
7 #include <stdint.h>
8
9 #include <algorithm> 7 #include <algorithm>
10 #include <set>
11 #include <string>
12 #include <vector>
13 8
14 #include "base/base64.h" 9 #include "base/base64.h"
15 #include "base/location.h" 10 #include "base/location.h"
16 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
17 #include "base/rand_util.h" 12 #include "base/rand_util.h"
18 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
19 #include "components/sync/base/attachment_id_proto.h" 14 #include "components/sync/base/attachment_id_proto.h"
20 #include "components/sync/base/cryptographer.h" 15 #include "components/sync/base/cryptographer.h"
21 #include "components/sync/base/model_type.h" 16 #include "components/sync/base/model_type.h"
22 #include "components/sync/base/time.h" 17 #include "components/sync/base/time.h"
23 #include "components/sync/base/unique_position.h" 18 #include "components/sync/base/unique_position.h"
24 #include "components/sync/engine_impl/conflict_resolver.h" 19 #include "components/sync/engine_impl/conflict_resolver.h"
25 #include "components/sync/engine_impl/syncer_proto_util.h" 20 #include "components/sync/engine_impl/syncer_proto_util.h"
26 #include "components/sync/engine_impl/syncer_types.h"
27 #include "components/sync/protocol/bookmark_specifics.pb.h" 21 #include "components/sync/protocol/bookmark_specifics.pb.h"
28 #include "components/sync/protocol/password_specifics.pb.h" 22 #include "components/sync/protocol/password_specifics.pb.h"
29 #include "components/sync/protocol/sync.pb.h" 23 #include "components/sync/protocol/sync.pb.h"
30 #include "components/sync/syncable/directory.h" 24 #include "components/sync/syncable/directory.h"
31 #include "components/sync/syncable/entry.h" 25 #include "components/sync/syncable/entry.h"
32 #include "components/sync/syncable/model_neutral_mutable_entry.h" 26 #include "components/sync/syncable/model_neutral_mutable_entry.h"
33 #include "components/sync/syncable/mutable_entry.h"
34 #include "components/sync/syncable/syncable_changes_version.h" 27 #include "components/sync/syncable/syncable_changes_version.h"
35 #include "components/sync/syncable/syncable_model_neutral_write_transaction.h" 28 #include "components/sync/syncable/syncable_model_neutral_write_transaction.h"
36 #include "components/sync/syncable/syncable_proto_util.h" 29 #include "components/sync/syncable/syncable_proto_util.h"
37 #include "components/sync/syncable/syncable_read_transaction.h" 30 #include "components/sync/syncable/syncable_read_transaction.h"
38 #include "components/sync/syncable/syncable_util.h" 31 #include "components/sync/syncable/syncable_util.h"
39 #include "components/sync/syncable/syncable_write_transaction.h" 32 #include "components/sync/syncable/syncable_write_transaction.h"
40 33
41 namespace syncer { 34 namespace syncer {
42 35
43 using syncable::CHANGES_VERSION; 36 using syncable::CHANGES_VERSION;
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 if (update.version() < target->GetServerVersion()) { 641 if (update.version() < target->GetServerVersion()) {
649 LOG(WARNING) << "Update older than current server version for " << *target 642 LOG(WARNING) << "Update older than current server version for " << *target
650 << " Update:" 643 << " Update:"
651 << SyncerProtoUtil::SyncEntityDebugString(update); 644 << SyncerProtoUtil::SyncEntityDebugString(update);
652 return VERIFY_SUCCESS; // Expected in new sync protocol. 645 return VERIFY_SUCCESS; // Expected in new sync protocol.
653 } 646 }
654 return VERIFY_UNDECIDED; 647 return VERIFY_UNDECIDED;
655 } 648 }
656 649
657 } // namespace syncer 650 } // namespace syncer
OLDNEW
« no previous file with comments | « components/sync/engine_impl/syncer_proto_util.cc ('k') | components/sync/engine_impl/update_applicator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698