| Index: sync/internal_api/js_sync_manager_observer.h
|
| diff --git a/sync/internal_api/js_sync_manager_observer.h b/sync/internal_api/js_sync_manager_observer.h
|
| index 75e5691b2cf03dda046b45c0f7e07e29a0b9ab35..918eab598794ee49a8eb586effe1718ee5258870 100644
|
| --- a/sync/internal_api/js_sync_manager_observer.h
|
| +++ b/sync/internal_api/js_sync_manager_observer.h
|
| @@ -18,27 +18,27 @@ namespace tracked_objects {
|
| class Location;
|
| } // namespace tracked_objects
|
|
|
| -namespace csync {
|
| +namespace syncer {
|
|
|
| class JsEventDetails;
|
| class JsEventHandler;
|
|
|
| // Routes SyncManager events to a JsEventHandler.
|
| -class JsSyncManagerObserver : public csync::SyncManager::Observer {
|
| +class JsSyncManagerObserver : public syncer::SyncManager::Observer {
|
| public:
|
| JsSyncManagerObserver();
|
| virtual ~JsSyncManagerObserver();
|
|
|
| void SetJsEventHandler(const WeakHandle<JsEventHandler>& event_handler);
|
|
|
| - // csync::SyncManager::Observer implementation.
|
| + // syncer::SyncManager::Observer implementation.
|
| virtual void OnSyncCycleCompleted(
|
| const sessions::SyncSessionSnapshot& snapshot) OVERRIDE;
|
| virtual void OnConnectionStatusChange(
|
| - csync::ConnectionStatus status) OVERRIDE;
|
| + syncer::ConnectionStatus status) OVERRIDE;
|
| virtual void OnUpdatedToken(const std::string& token) OVERRIDE;
|
| virtual void OnPassphraseRequired(
|
| - csync::PassphraseRequiredReason reason,
|
| + syncer::PassphraseRequiredReason reason,
|
| const sync_pb::EncryptedData& pending_keys) OVERRIDE;
|
| virtual void OnPassphraseAccepted() OVERRIDE;
|
| virtual void OnBootstrapTokenUpdated(
|
| @@ -51,7 +51,7 @@ class JsSyncManagerObserver : public csync::SyncManager::Observer {
|
| const WeakHandle<JsBackend>& js_backend, bool success) OVERRIDE;
|
| virtual void OnStopSyncingPermanently() OVERRIDE;
|
| virtual void OnActionableError(
|
| - const csync::SyncProtocolError& sync_protocol_error) OVERRIDE;
|
| + const syncer::SyncProtocolError& sync_protocol_error) OVERRIDE;
|
|
|
| private:
|
| void HandleJsEvent(const tracked_objects::Location& from_here,
|
| @@ -62,6 +62,6 @@ class JsSyncManagerObserver : public csync::SyncManager::Observer {
|
| DISALLOW_COPY_AND_ASSIGN(JsSyncManagerObserver);
|
| };
|
|
|
| -} // namespace csync
|
| +} // namespace syncer
|
|
|
| #endif // SYNC_INTERNAL_API_JS_SYNC_MANAGER_OBSERVER_H_
|
|
|