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

Side by Side Diff: chrome/browser/sync/engine/syncer_util.cc

Issue 7587009: sync: add DEPS files to subdirs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix include Created 9 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <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/tracked.h" 12 #include "base/tracked.h"
13 #include "chrome/browser/sync/engine/conflict_resolver.h" 13 #include "chrome/browser/sync/engine/conflict_resolver.h"
14 #include "chrome/browser/sync/engine/nigori_util.h"
14 #include "chrome/browser/sync/engine/syncer_proto_util.h" 15 #include "chrome/browser/sync/engine/syncer_proto_util.h"
15 #include "chrome/browser/sync/engine/syncer_types.h" 16 #include "chrome/browser/sync/engine/syncer_types.h"
16 #include "chrome/browser/sync/engine/syncproto.h" 17 #include "chrome/browser/sync/engine/syncproto.h"
17 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" 18 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
18 #include "chrome/browser/sync/protocol/nigori_specifics.pb.h" 19 #include "chrome/browser/sync/protocol/nigori_specifics.pb.h"
19 #include "chrome/browser/sync/protocol/password_specifics.pb.h" 20 #include "chrome/browser/sync/protocol/password_specifics.pb.h"
20 #include "chrome/browser/sync/protocol/sync.pb.h" 21 #include "chrome/browser/sync/protocol/sync.pb.h"
21 #include "chrome/browser/sync/syncable/directory_manager.h" 22 #include "chrome/browser/sync/syncable/directory_manager.h"
22 #include "chrome/browser/sync/syncable/model_type.h" 23 #include "chrome/browser/sync/syncable/model_type.h"
23 #include "chrome/browser/sync/syncable/nigori_util.h"
24 #include "chrome/browser/sync/syncable/syncable.h" 24 #include "chrome/browser/sync/syncable/syncable.h"
25 #include "chrome/browser/sync/syncable/syncable_changes_version.h" 25 #include "chrome/browser/sync/syncable/syncable_changes_version.h"
26 26
27 using syncable::BASE_VERSION; 27 using syncable::BASE_VERSION;
28 using syncable::Blob; 28 using syncable::Blob;
29 using syncable::CHANGES_VERSION; 29 using syncable::CHANGES_VERSION;
30 using syncable::CREATE; 30 using syncable::CREATE;
31 using syncable::CREATE_NEW_UPDATE_ITEM; 31 using syncable::CREATE_NEW_UPDATE_ITEM;
32 using syncable::CTIME; 32 using syncable::CTIME;
33 using syncable::Directory; 33 using syncable::Directory;
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 if (update.version() < target->Get(SERVER_VERSION)) { 820 if (update.version() < target->Get(SERVER_VERSION)) {
821 LOG(WARNING) << "Update older than current server version for " 821 LOG(WARNING) << "Update older than current server version for "
822 << *target << " Update:" 822 << *target << " Update:"
823 << SyncerProtoUtil::SyncEntityDebugString(update); 823 << SyncerProtoUtil::SyncEntityDebugString(update);
824 return VERIFY_SUCCESS; // Expected in new sync protocol. 824 return VERIFY_SUCCESS; // Expected in new sync protocol.
825 } 825 }
826 return VERIFY_UNDECIDED; 826 return VERIFY_UNDECIDED;
827 } 827 }
828 828
829 } // namespace browser_sync 829 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/engine/syncer_unittest.cc ('k') | chrome/browser/sync/glue/app_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698