chrome/browser/sync/syncable/syncable_enum_conversions.cc - 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_enum_conversions.cc

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_enum_conversions.cc

diff --git a/chrome/browser/sync/syncable/syncable_enum_conversions.cc b/chrome/browser/sync/syncable/syncable_enum_conversions.cc

index 0a371d97892d48849498094366f8d42d3f47843b..a22a1cfa82d6bcad968d93d5f731f5864dc42dd4 100644

--- a/chrome/browser/sync/syncable/syncable_enum_conversions.cc

+++ b/chrome/browser/sync/syncable/syncable_enum_conversions.cc

@@ -135,11 +135,12 @@ const char* GetStringFieldString(StringField string_field) {

}

const char* GetProtoFieldString(ProtoField proto_field) {

- ASSERT_ENUM_BOUNDS(SPECIFICS, SERVER_SPECIFICS,

+ ASSERT_ENUM_BOUNDS(SPECIFICS, BASE_SERVER_SPECIFICS,

PROTO_FIELDS_BEGIN, PROTO_FIELDS_END - 1);

switch (proto_field) {

ENUM_CASE(SPECIFICS);

ENUM_CASE(SERVER_SPECIFICS);

+ ENUM_CASE(BASE_SERVER_SPECIFICS);

case PROTO_FIELDS_END: break;

}

NOTREACHED();