diff options
Diffstat (limited to 'chrome/browser/sync/glue/sync_backend_host_impl.h')
| -rw-r--r-- | chrome/browser/sync/glue/sync_backend_host_impl.h | 91 |
1 files changed, 43 insertions, 48 deletions
diff --git a/chrome/browser/sync/glue/sync_backend_host_impl.h b/chrome/browser/sync/glue/sync_backend_host_impl.h index b5ce0e1..35001d1e 100644 --- a/chrome/browser/sync/glue/sync_backend_host_impl.h +++ b/chrome/browser/sync/glue/sync_backend_host_impl.h @@ -76,10 +76,10 @@ class SyncBackendHostImpl invalidation::InvalidationService* invalidator, const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs, const base::FilePath& sync_folder); - virtual ~SyncBackendHostImpl(); + ~SyncBackendHostImpl() override; // SyncBackendHost implementation. - virtual void Initialize( + void Initialize( sync_driver::SyncFrontend* frontend, scoped_ptr<base::Thread> sync_thread, const syncer::WeakHandle<syncer::JsEventHandler>& event_handler, @@ -91,52 +91,49 @@ class SyncBackendHostImpl syncer::ReportUnrecoverableErrorFunction report_unrecoverable_error_function, syncer::NetworkResources* network_resources) override; - virtual void UpdateCredentials( - const syncer::SyncCredentials& credentials) override; - virtual void StartSyncingWithServer() override; - virtual void SetEncryptionPassphrase( - const std::string& passphrase, - bool is_explicit) override; - virtual bool SetDecryptionPassphrase(const std::string& passphrase) - override WARN_UNUSED_RESULT; - virtual void StopSyncingForShutdown() override; - virtual scoped_ptr<base::Thread> Shutdown(syncer::ShutdownReason reason) - override; - virtual void UnregisterInvalidationIds() override; - virtual void ConfigureDataTypes( + void UpdateCredentials(const syncer::SyncCredentials& credentials) override; + void StartSyncingWithServer() override; + void SetEncryptionPassphrase(const std::string& passphrase, + bool is_explicit) override; + bool SetDecryptionPassphrase(const std::string& passphrase) override + WARN_UNUSED_RESULT; + void StopSyncingForShutdown() override; + scoped_ptr<base::Thread> Shutdown(syncer::ShutdownReason reason) override; + void UnregisterInvalidationIds() override; + void ConfigureDataTypes( syncer::ConfigureReason reason, const DataTypeConfigStateMap& config_state_map, - const base::Callback<void(syncer::ModelTypeSet, - syncer::ModelTypeSet)>& ready_task, + const base::Callback<void(syncer::ModelTypeSet, syncer::ModelTypeSet)>& + ready_task, const base::Callback<void()>& retry_callback) override; - virtual void ActivateDataType( - syncer::ModelType type, syncer::ModelSafeGroup group, - sync_driver::ChangeProcessor* change_processor) override; - virtual void DeactivateDataType(syncer::ModelType type) override; - virtual void EnableEncryptEverything() override; - virtual syncer::UserShare* GetUserShare() const override; - virtual scoped_ptr<syncer::SyncContextProxy> GetSyncContextProxy() override; - virtual Status GetDetailedStatus() override; - virtual syncer::sessions::SyncSessionSnapshot - GetLastSessionSnapshot() const override; - virtual bool HasUnsyncedItems() const override; - virtual bool IsNigoriEnabled() const override; - virtual syncer::PassphraseType GetPassphraseType() const override; - virtual base::Time GetExplicitPassphraseTime() const override; - virtual bool IsCryptographerReady( + void ActivateDataType( + syncer::ModelType type, + syncer::ModelSafeGroup group, + sync_driver::ChangeProcessor* change_processor) override; + void DeactivateDataType(syncer::ModelType type) override; + void EnableEncryptEverything() override; + syncer::UserShare* GetUserShare() const override; + scoped_ptr<syncer::SyncContextProxy> GetSyncContextProxy() override; + Status GetDetailedStatus() override; + syncer::sessions::SyncSessionSnapshot GetLastSessionSnapshot() const override; + bool HasUnsyncedItems() const override; + bool IsNigoriEnabled() const override; + syncer::PassphraseType GetPassphraseType() const override; + base::Time GetExplicitPassphraseTime() const override; + bool IsCryptographerReady( const syncer::BaseTransaction* trans) const override; - virtual void GetModelSafeRoutingInfo( + void GetModelSafeRoutingInfo( syncer::ModelSafeRoutingInfo* out) const override; - virtual void FlushDirectory() const override; - virtual void RequestBufferedProtocolEventsAndEnableForwarding() override; - virtual void DisableProtocolEventForwarding() override; - virtual void EnableDirectoryTypeDebugInfoForwarding() override; - virtual void DisableDirectoryTypeDebugInfoForwarding() override; - virtual void GetAllNodesForTypes( + void FlushDirectory() const override; + void RequestBufferedProtocolEventsAndEnableForwarding() override; + void DisableProtocolEventForwarding() override; + void EnableDirectoryTypeDebugInfoForwarding() override; + void DisableDirectoryTypeDebugInfoForwarding() override; + void GetAllNodesForTypes( syncer::ModelTypeSet types, base::Callback<void(const std::vector<syncer::ModelType>&, ScopedVector<base::ListValue>)> type) override; - virtual base::MessageLoop* GetSyncLoopForTesting() override; + base::MessageLoop* GetSyncLoopForTesting() override; protected: // The types and functions below are protected so that test @@ -292,17 +289,15 @@ class SyncBackendHostImpl syncer::ConnectionStatus status); // NotificationObserver implementation. - virtual void Observe( - int type, - const content::NotificationSource& source, - const content::NotificationDetails& details) override; + void Observe(int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) override; // InvalidationHandler implementation. - virtual void OnInvalidatorStateChange( - syncer::InvalidatorState state) override; - virtual void OnIncomingInvalidation( + void OnInvalidatorStateChange(syncer::InvalidatorState state) override; + void OnIncomingInvalidation( const syncer::ObjectIdInvalidationMap& invalidation_map) override; - virtual std::string GetOwnerName() const override; + std::string GetOwnerName() const override; content::NotificationRegistrar notification_registrar_; |