sync/engine/conflict_resolver.cc - Issue 10795018: [Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings

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: sync/engine/conflict_resolver.cc

Issue 10795018: [Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix indent Created 8 years, 5 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:

Index: sync/engine/conflict_resolver.cc

diff --git a/sync/engine/conflict_resolver.cc b/sync/engine/conflict_resolver.cc

index 458c7ceb8bf42f459f6ff405511b496ec1abf175..2a3c62d836b196da22ff4842037c1f660882b725 100644

--- a/sync/engine/conflict_resolver.cc

+++ b/sync/engine/conflict_resolver.cc

@@ -221,7 +221,7 @@ ConflictResolver::ProcessSimpleConflict(WriteTransaction* trans,

}

// We manually merge nigori data.

- if (entry.GetModelType() == syncer::NIGORI) {

+ if (entry.GetModelType() == NIGORI) {

// Create a new set of specifics based on the server specifics (which

// preserves their encryption keys).

sync_pb::EntitySpecifics specifics =