Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1210)

Unified Diff: sync/engine/resolve_conflicts_command.h

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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/engine/process_updates_command_unittest.cc ('k') | sync/engine/resolve_conflicts_command.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/resolve_conflicts_command.h
diff --git a/sync/engine/resolve_conflicts_command.h b/sync/engine/resolve_conflicts_command.h
index 217ddb2c772ac1f7069932e3681c71e5ef4a6bf2..22a9302a778c5d75415412bc057a21b903614dc4 100644
--- a/sync/engine/resolve_conflicts_command.h
+++ b/sync/engine/resolve_conflicts_command.h
@@ -10,7 +10,7 @@
#include "base/compiler_specific.h"
#include "sync/engine/model_changing_syncer_command.h"
-namespace csync {
+namespace syncer {
class ResolveConflictsCommand : public ModelChangingSyncerCommand {
public:
@@ -28,6 +28,6 @@ class ResolveConflictsCommand : public ModelChangingSyncerCommand {
DISALLOW_COPY_AND_ASSIGN(ResolveConflictsCommand);
};
-} // namespace csync
+} // namespace syncer
#endif // SYNC_ENGINE_RESOLVE_CONFLICTS_COMMAND_H_
« no previous file with comments | « sync/engine/process_updates_command_unittest.cc ('k') | sync/engine/resolve_conflicts_command.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698