sync/engine/syncer.h - Issue 11636006: WIP: The Bookmark Position Megapatch

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: sync/engine/syncer.h

Issue 11636006: WIP: The Bookmark Position Megapatch (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Various updates, including switch suffix to unique_client_tag style Created 8 years 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 | « sync/engine/process_updates_command_unittest.cc ('k') | sync/engine/syncer.cc » ('j') | no next file with comments »

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 #ifndef SYNC_ENGINE_SYNCER_H_	5 #ifndef SYNC_ENGINE_SYNCER_H_

6 #define SYNC_ENGINE_SYNCER_H_	6 #define SYNC_ENGINE_SYNCER_H_

7	7

8 #include <utility>	8 #include <utility>

9 #include <vector>	9 #include <vector>

10	10

(...skipping 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
87 FRIEND_TEST_ALL_PREFIXES(SyncerTest, LongChangelistWithApplicationConflict);	87 FRIEND_TEST_ALL_PREFIXES(SyncerTest, LongChangelistWithApplicationConflict);

88 FRIEND_TEST_ALL_PREFIXES(SyncerTest, DeletingEntryWithLocalEdits);	88 FRIEND_TEST_ALL_PREFIXES(SyncerTest, DeletingEntryWithLocalEdits);

89 FRIEND_TEST_ALL_PREFIXES(EntryCreatedInNewFolderTest,	89 FRIEND_TEST_ALL_PREFIXES(EntryCreatedInNewFolderTest,

90 EntryCreatedInNewFolderMidSync);	90 EntryCreatedInNewFolderMidSync);

91	91

92 DISALLOW_COPY_AND_ASSIGN(Syncer);	92 DISALLOW_COPY_AND_ASSIGN(Syncer);

93 };	93 };

94	94

95 // Utility function declarations.	95 // Utility function declarations.

96 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest);	96 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest);

97 void ClearServerData(syncable::MutableEntry* entry);

98 const char* SyncerStepToString(const SyncerStep);	97 const char* SyncerStepToString(const SyncerStep);

99	98

100 } // namespace syncer	99 } // namespace syncer

101	100

102 #endif // SYNC_ENGINE_SYNCER_H_	101 #endif // SYNC_ENGINE_SYNCER_H_

OLD	NEW