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-07-20 17:25:41 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 17:25:41 +0000
commitd45f0d9764d93d8f89564a5df7fa505c6a87a6fe (patch)
tree89ce4ea823cf922e6955dafcfb275459589cef0a /sync/internal_api/js_sync_manager_observer.cc
parent73e5d26041b0a22e16e383e84a8177930c9fd055 (diff)
downloadchromium_src-d45f0d9764d93d8f89564a5df7fa505c6a87a6fe.zip
chromium_src-d45f0d9764d93d8f89564a5df7fa505c6a87a6fe.tar.gz
chromium_src-d45f0d9764d93d8f89564a5df7fa505c6a87a6fe.tar.bz2
[Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings
Since (almost) everything in sync/ is now in the 'syncer' namespace, all of these are redundant. Clean up indentation. Put sync_{client,listen_notifications} into syncer namespace. BUG=128060 TEST= Review URL: https://chromiumcodereview.appspot.com/10795018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147675 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.cc15
1 files changed, 6 insertions, 9 deletions
diff --git a/sync/internal_api/js_sync_manager_observer.cc b/sync/internal_api/js_sync_manager_observer.cc
index 4e98fd9..5eda7f1 100644
--- a/sync/internal_api/js_sync_manager_observer.cc
+++ b/sync/internal_api/js_sync_manager_observer.cc
@@ -21,8 +21,6 @@
namespace syncer {
-using syncer::SyncProtocolError;
-
JsSyncManagerObserver::JsSyncManagerObserver() {}
JsSyncManagerObserver::~JsSyncManagerObserver() {}
@@ -42,13 +40,12 @@ void JsSyncManagerObserver::OnSyncCycleCompleted(
HandleJsEvent(FROM_HERE, "onSyncCycleCompleted", JsEventDetails(&details));
}
-void JsSyncManagerObserver::OnConnectionStatusChange(
- syncer::ConnectionStatus status) {
+void JsSyncManagerObserver::OnConnectionStatusChange(ConnectionStatus status) {
if (!event_handler_.IsInitialized()) {
return;
}
DictionaryValue details;
- details.SetString("status", syncer::ConnectionStatusToString(status));
+ details.SetString("status", ConnectionStatusToString(status));
HandleJsEvent(FROM_HERE,
"onConnectionStatusChange", JsEventDetails(&details));
}
@@ -63,14 +60,14 @@ void JsSyncManagerObserver::OnUpdatedToken(const std::string& token) {
}
void JsSyncManagerObserver::OnPassphraseRequired(
- syncer::PassphraseRequiredReason reason,
+ PassphraseRequiredReason reason,
const sync_pb::EncryptedData& pending_keys) {
if (!event_handler_.IsInitialized()) {
return;
}
DictionaryValue details;
details.SetString("reason",
- syncer::PassphraseRequiredReasonToString(reason));
+ PassphraseRequiredReasonToString(reason));
HandleJsEvent(FROM_HERE, "onPassphraseRequired", JsEventDetails(&details));
}
@@ -93,14 +90,14 @@ void JsSyncManagerObserver::OnBootstrapTokenUpdated(
}
void JsSyncManagerObserver::OnEncryptedTypesChanged(
- syncer::ModelTypeSet encrypted_types,
+ ModelTypeSet encrypted_types,
bool encrypt_everything) {
if (!event_handler_.IsInitialized()) {
return;
}
DictionaryValue details;
details.Set("encryptedTypes",
- syncer::ModelTypeSetToValue(encrypted_types));
+ ModelTypeSetToValue(encrypted_types));
details.SetBoolean("encryptEverything", encrypt_everything);
HandleJsEvent(FROM_HERE,
"onEncryptedTypesChanged", JsEventDetails(&details));