Index: chrome/browser/sync/glue/sync_backend_host_core.h |
diff --git a/chrome/browser/sync/glue/sync_backend_host_core.h b/chrome/browser/sync/glue/sync_backend_host_core.h |
index 06fdd4ff21b52d7c52c753d2fb496698b3b9044e..88a7e6f0c3aae89e490c6b98082e32d3d09c30ae 100644 |
--- a/chrome/browser/sync/glue/sync_backend_host_core.h |
+++ b/chrome/browser/sync/glue/sync_backend_host_core.h |
@@ -90,48 +90,41 @@ class SyncBackendHostCore |
// SyncManager::Observer implementation. The Core just acts like an air |
// traffic controller here, forwarding incoming messages to appropriate |
// landing threads. |
- virtual void OnSyncCycleCompleted( |
+ void OnSyncCycleCompleted( |
const syncer::sessions::SyncSessionSnapshot& snapshot) override; |
- virtual void OnInitializationComplete( |
+ void OnInitializationComplete( |
const syncer::WeakHandle<syncer::JsBackend>& js_backend, |
const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>& |
debug_info_listener, |
bool success, |
syncer::ModelTypeSet restored_types) override; |
- virtual void OnConnectionStatusChange( |
- syncer::ConnectionStatus status) override; |
- virtual void OnActionableError( |
- const syncer::SyncProtocolError& sync_error) override; |
- virtual void OnMigrationRequested(syncer::ModelTypeSet types) override; |
- virtual void OnProtocolEvent(const syncer::ProtocolEvent& event) override; |
+ void OnConnectionStatusChange(syncer::ConnectionStatus status) override; |
+ void OnActionableError(const syncer::SyncProtocolError& sync_error) override; |
+ void OnMigrationRequested(syncer::ModelTypeSet types) override; |
+ void OnProtocolEvent(const syncer::ProtocolEvent& event) override; |
// SyncEncryptionHandler::Observer implementation. |
- virtual void OnPassphraseRequired( |
+ void OnPassphraseRequired( |
syncer::PassphraseRequiredReason reason, |
const sync_pb::EncryptedData& pending_keys) override; |
- virtual void OnPassphraseAccepted() override; |
- virtual void OnBootstrapTokenUpdated( |
- const std::string& bootstrap_token, |
- syncer::BootstrapTokenType type) override; |
- virtual void OnEncryptedTypesChanged( |
- syncer::ModelTypeSet encrypted_types, |
- bool encrypt_everything) override; |
- virtual void OnEncryptionComplete() override; |
- virtual void OnCryptographerStateChanged( |
+ void OnPassphraseAccepted() override; |
+ void OnBootstrapTokenUpdated(const std::string& bootstrap_token, |
+ syncer::BootstrapTokenType type) override; |
+ void OnEncryptedTypesChanged(syncer::ModelTypeSet encrypted_types, |
+ bool encrypt_everything) override; |
+ void OnEncryptionComplete() override; |
+ void OnCryptographerStateChanged( |
syncer::Cryptographer* cryptographer) override; |
- virtual void OnPassphraseTypeChanged(syncer::PassphraseType type, |
- base::Time passphrase_time) override; |
+ void OnPassphraseTypeChanged(syncer::PassphraseType type, |
+ base::Time passphrase_time) override; |
// TypeDebugInfoObserver implementation |
- virtual void OnCommitCountersUpdated( |
- syncer::ModelType type, |
- const syncer::CommitCounters& counters) override; |
- virtual void OnUpdateCountersUpdated( |
- syncer::ModelType type, |
- const syncer::UpdateCounters& counters) override; |
- virtual void OnStatusCountersUpdated( |
- syncer::ModelType type, |
- const syncer::StatusCounters& counters) override; |
+ void OnCommitCountersUpdated(syncer::ModelType type, |
+ const syncer::CommitCounters& counters) override; |
+ void OnUpdateCountersUpdated(syncer::ModelType type, |
+ const syncer::UpdateCounters& counters) override; |
+ void OnStatusCountersUpdated(syncer::ModelType type, |
+ const syncer::StatusCounters& counters) override; |
// Forwards an invalidation state change to the sync manager. |
void DoOnInvalidatorStateChange(syncer::InvalidatorState state); |
@@ -248,7 +241,7 @@ class SyncBackendHostCore |
friend class base::RefCountedThreadSafe<SyncBackendHostCore>; |
friend class SyncBackendHostForProfileSyncTest; |
- virtual ~SyncBackendHostCore(); |
+ ~SyncBackendHostCore() override; |
// Invoked when initialization of syncapi is complete and we can start |
// our timer. |