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

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

index edef3ff6f22fb965286d8ba56ee94124e4502db4..a1ffbde3f9686fddfeec91ef5817f13f56575020 100644

--- a/sync/engine/resolve_conflicts_command.cc

+++ b/sync/engine/resolve_conflicts_command.cc

@@ -10,7 +10,7 @@

#include "sync/syncable/directory.h"

#include "sync/syncable/write_transaction.h"

-namespace csync {

+namespace syncer {

ResolveConflictsCommand::ResolveConflictsCommand() {}

ResolveConflictsCommand::~ResolveConflictsCommand() {}

@@ -38,4 +38,4 @@ SyncerError ResolveConflictsCommand::ModelChangingExecuteImpl(

return SYNCER_OK;

}

-} // namespace csync

+} // namespace syncer