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/sessions/sync_session_context.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/sessions/sync_session_context.h')
-rw-r--r-- | sync/sessions/sync_session_context.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sync/sessions/sync_session_context.h b/sync/sessions/sync_session_context.h index 20f574c..ab54042 100644 --- a/sync/sessions/sync_session_context.h +++ b/sync/sessions/sync_session_context.h @@ -34,7 +34,7 @@ namespace syncable { class Directory; } -namespace csync { +namespace syncer { class ConflictResolver; class ExtensionsActivityMonitor; @@ -58,7 +58,7 @@ class SyncSessionContext { ThrottledDataTypeTracker* throttled_data_type_tracker, const std::vector<SyncEngineEventListener*>& listeners, DebugInfoGetter* debug_info_getter, - csync::TrafficRecorder* traffic_recorder); + syncer::TrafficRecorder* traffic_recorder); ~SyncSessionContext(); ConflictResolver* resolver() { return resolver_; } @@ -124,7 +124,7 @@ class SyncSessionContext { OnSyncEngineEvent(event)); } - csync::TrafficRecorder* traffic_recorder() { + syncer::TrafficRecorder* traffic_recorder() { return traffic_recorder_; } @@ -174,7 +174,7 @@ class SyncSessionContext { // client behavior on server side. DebugInfoGetter* const debug_info_getter_; - csync::TrafficRecorder* traffic_recorder_; + syncer::TrafficRecorder* traffic_recorder_; DISALLOW_COPY_AND_ASSIGN(SyncSessionContext); }; @@ -203,6 +203,6 @@ class ScopedSessionContextConflictResolver { }; } // namespace sessions -} // namespace csync +} // namespace syncer #endif // SYNC_SESSIONS_SYNC_SESSION_CONTEXT_H_ |