summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/js_sync_manager_observer.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 22:43:58 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 22:43:58 +0000
commit65f173550226cb0dcf577183a462d48c47764ee3 (patch)
tree9d4451edfc037f39658b804f95a3fbdbc85a7bd5 /sync/internal_api/js_sync_manager_observer.cc
parent7953ef8eea2001287dbd233421226ad3f0e16448 (diff)
downloadchromium_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/internal_api/js_sync_manager_observer.cc')
-rw-r--r--sync/internal_api/js_sync_manager_observer.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/sync/internal_api/js_sync_manager_observer.cc b/sync/internal_api/js_sync_manager_observer.cc
index 21a3ad2..70b4e48 100644
--- a/sync/internal_api/js_sync_manager_observer.cc
+++ b/sync/internal_api/js_sync_manager_observer.cc
@@ -18,9 +18,9 @@
#include "sync/js/js_event_handler.h"
#include "sync/sessions/session_state.h"
-namespace csync {
+namespace syncer {
-using csync::SyncProtocolError;
+using syncer::SyncProtocolError;
JsSyncManagerObserver::JsSyncManagerObserver() {}
@@ -42,12 +42,12 @@ void JsSyncManagerObserver::OnSyncCycleCompleted(
}
void JsSyncManagerObserver::OnConnectionStatusChange(
- csync::ConnectionStatus status) {
+ syncer::ConnectionStatus status) {
if (!event_handler_.IsInitialized()) {
return;
}
DictionaryValue details;
- details.SetString("status", csync::ConnectionStatusToString(status));
+ details.SetString("status", syncer::ConnectionStatusToString(status));
HandleJsEvent(FROM_HERE,
"onConnectionStatusChange", JsEventDetails(&details));
}
@@ -62,14 +62,14 @@ void JsSyncManagerObserver::OnUpdatedToken(const std::string& token) {
}
void JsSyncManagerObserver::OnPassphraseRequired(
- csync::PassphraseRequiredReason reason,
+ syncer::PassphraseRequiredReason reason,
const sync_pb::EncryptedData& pending_keys) {
if (!event_handler_.IsInitialized()) {
return;
}
DictionaryValue details;
details.SetString("reason",
- csync::PassphraseRequiredReasonToString(reason));
+ syncer::PassphraseRequiredReasonToString(reason));
HandleJsEvent(FROM_HERE, "onPassphraseRequired", JsEventDetails(&details));
}
@@ -153,4 +153,4 @@ void JsSyncManagerObserver::HandleJsEvent(
&JsEventHandler::HandleJsEvent, name, details);
}
-} // namespace csync
+} // namespace syncer