sync/engine/conflict_resolver.cc - Issue 10698014: [Sync] Rename csync namespace to syncer

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 10698014: [Sync] Rename csync namespace to syncer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments Created 8 years, 6 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 156bc907f84faaad740abd425e88bd2a97e36fd6..e708f45cdb78d22f4e9cac3415c270c3f6ae1922 100644

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

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

@@ -32,7 +32,7 @@ using syncable::IsRealDataType;

using syncable::MutableEntry;

using syncable::WriteTransaction;

-namespace csync {

+namespace syncer {

using sessions::ConflictProgress;

using sessions::StatusController;

@@ -417,4 +417,4 @@ bool ConflictResolver::ResolveConflicts(syncable::WriteTransaction* trans,

return forward_progress;

}

-} // namespace csync

+} // namespace syncer

« no previous file with comments | « sync/engine/conflict_resolver.h ('k') | sync/engine/download_updates_command.h » ('j') | no next file with comments »