chrome/browser/sync/engine/syncer_util.cc - Issue 7879006: Delete Tracked, and move Location to its own file.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 7879006: Delete Tracked, and move Location to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased Created 9 years, 3 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

« no previous file with comments | « chrome/browser/sync/engine/syncer_unittest.cc ('k') | chrome/browser/sync/engine/verify_updates_command.cc » ('j') | no next file with comments »

OLD	NEW
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/location.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/nigori_util.h"

15 #include "chrome/browser/sync/engine/syncer_proto_util.h"	15 #include "chrome/browser/sync/engine/syncer_proto_util.h"

16 #include "chrome/browser/sync/engine/syncer_types.h"	16 #include "chrome/browser/sync/engine/syncer_types.h"

17 #include "chrome/browser/sync/engine/syncproto.h"	17 #include "chrome/browser/sync/engine/syncproto.h"

18 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"	18 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"

19 #include "chrome/browser/sync/protocol/nigori_specifics.pb.h"	19 #include "chrome/browser/sync/protocol/nigori_specifics.pb.h"

20 #include "chrome/browser/sync/protocol/password_specifics.pb.h"	20 #include "chrome/browser/sync/protocol/password_specifics.pb.h"

21 #include "chrome/browser/sync/protocol/sync.pb.h"	21 #include "chrome/browser/sync/protocol/sync.pb.h"

22 #include "chrome/browser/sync/syncable/directory_manager.h"	22 #include "chrome/browser/sync/syncable/directory_manager.h"

(...skipping 806 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
829 if (update.version() < target->Get(SERVER_VERSION)) {	829 if (update.version() < target->Get(SERVER_VERSION)) {

830 LOG(WARNING) << "Update older than current server version for "	830 LOG(WARNING) << "Update older than current server version for "

831 << *target << " Update:"	831 << *target << " Update:"

832 << SyncerProtoUtil::SyncEntityDebugString(update);	832 << SyncerProtoUtil::SyncEntityDebugString(update);

833 return VERIFY_SUCCESS; // Expected in new sync protocol.	833 return VERIFY_SUCCESS; // Expected in new sync protocol.

834 }	834 }

835 return VERIFY_UNDECIDED;	835 return VERIFY_UNDECIDED;

836 }	836 }

837	837

838 } // namespace browser_sync	838 } // namespace browser_sync

OLD	NEW