diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-28 22:43:58 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-28 22:43:58 +0000 |
| commit | 65f173550226cb0dcf577183a462d48c47764ee3 (patch) | |
| tree | 9d4451edfc037f39658b804f95a3fbdbc85a7bd5 /sync/engine/conflict_resolver.h | |
| parent | 7953ef8eea2001287dbd233421226ad3f0e16448 (diff) | |
| download | chromium_src-65f173550226cb0dcf577183a462d48c47764ee3.zip chromium_src-65f173550226cb0dcf577183a462d48c47764ee3.tar.gz chromium_src-65f173550226cb0dcf577183a462d48c47764ee3.tar.bz2 | |
[Sync] Rename csync namespace to syncer
Everyone was confused by 'csync'. 'syncer' seems more understandable.
(Note that we can't use the 'sync' namespace since sync() is a function
from unistd.h.)
BUG=10662035
TEST=
TBR=jhawkins@chromium.org,pkasting@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10698014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/conflict_resolver.h')
| -rw-r--r-- | sync/engine/conflict_resolver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sync/engine/conflict_resolver.h b/sync/engine/conflict_resolver.h index fedaa45..733348c 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_ |