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

Unified Diff: sync/engine/conflict_resolver.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/commit.cc ('k') | sync/engine/conflict_resolver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/conflict_resolver.h
diff --git a/sync/engine/conflict_resolver.h b/sync/engine/conflict_resolver.h
index fedaa45804ca03521bc4bdb44a687a1d5c666e78..733348ce9a3310b03855afa4a315969344240991 100644
--- a/sync/engine/conflict_resolver.h
+++ b/sync/engine/conflict_resolver.h
@@ -24,7 +24,7 @@ class MutableEntry;
class WriteTransaction;
} // namespace syncable
-namespace csync {
+namespace syncer {
class Cryptographer;
@@ -84,6 +84,6 @@ class ConflictResolver {
DISALLOW_COPY_AND_ASSIGN(ConflictResolver);
};
-} // namespace csync
+} // namespace syncer
#endif // SYNC_ENGINE_CONFLICT_RESOLVER_H_
« no previous file with comments | « sync/engine/commit.cc ('k') | sync/engine/conflict_resolver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698