chrome/browser/sync/syncable/syncable.h - Issue 8770032: [Sync] Implement encryption-aware conflict resolution.

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

Unified Diff: chrome/browser/sync/syncable/syncable.h

Issue 8770032: [Sync] Implement encryption-aware conflict resolution. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix test Created 9 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:

Index: chrome/browser/sync/syncable/syncable.h

diff --git a/chrome/browser/sync/syncable/syncable.h b/chrome/browser/sync/syncable/syncable.h

index 3ab7e3f4000bab67e970c7d4e82188f06c1307e5..0ab56a93a7d18d68c478dcadf6fc693b2054addc 100644

--- a/chrome/browser/sync/syncable/syncable.h

+++ b/chrome/browser/sync/syncable/syncable.h

@@ -177,6 +177,7 @@ enum {

enum ProtoField {

SPECIFICS = PROTO_FIELDS_BEGIN,

SERVER_SPECIFICS,

+ BASE_SERVER_SPECIFICS,

PROTO_FIELDS_END,

};

@@ -738,7 +739,6 @@ struct Index {

// be held before acquiring the kernel lock.

class ScopedKernelLock;

class IdFilter;

-class DirectoryManager;

class Directory {

friend class BaseTransaction;