| Index: chrome/browser/sync/profile_sync_service.h
|
| diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
|
| index 07735b876500969162f00a13f6f85deb6f3b2768..631c7808ceb0f37934a34f03708a969835485aaf 100644
|
| --- a/chrome/browser/sync/profile_sync_service.h
|
| +++ b/chrome/browser/sync/profile_sync_service.h
|
| @@ -275,7 +275,7 @@ class ProfileSyncService : public ProfileSyncServiceBase,
|
| scoped_ptr<SupervisedUserSigninManagerWrapper> signin_wrapper,
|
| ProfileOAuth2TokenService* oauth2_token_service,
|
| browser_sync::ProfileSyncServiceStartBehavior start_behavior);
|
| - virtual ~ProfileSyncService();
|
| + ~ProfileSyncService() override;
|
|
|
| // Initializes the object. This must be called at most once, and
|
| // immediately after an object of this class is constructed.
|
| @@ -284,14 +284,12 @@ class ProfileSyncService : public ProfileSyncServiceBase,
|
| virtual void SetSyncSetupCompleted();
|
|
|
| // ProfileSyncServiceBase implementation.
|
| - virtual bool HasSyncSetupCompleted() const override;
|
| - virtual bool SyncActive() const override;
|
| - virtual syncer::ModelTypeSet GetActiveDataTypes() const override;
|
| - virtual void AddObserver(ProfileSyncServiceBase::Observer* observer) override;
|
| - virtual void RemoveObserver(
|
| - ProfileSyncServiceBase::Observer* observer) override;
|
| - virtual bool HasObserver(
|
| - ProfileSyncServiceBase::Observer* observer) const override;
|
| + bool HasSyncSetupCompleted() const override;
|
| + bool SyncActive() const override;
|
| + syncer::ModelTypeSet GetActiveDataTypes() const override;
|
| + void AddObserver(ProfileSyncServiceBase::Observer* observer) override;
|
| + void RemoveObserver(ProfileSyncServiceBase::Observer* observer) override;
|
| + bool HasObserver(ProfileSyncServiceBase::Observer* observer) const override;
|
|
|
| void AddProtocolEventObserver(browser_sync::ProtocolEventObserver* observer);
|
| void RemoveProtocolEventObserver(
|
| @@ -393,55 +391,50 @@ class ProfileSyncService : public ProfileSyncServiceBase,
|
| virtual void StopSyncingPermanently();
|
|
|
| // SyncFrontend implementation.
|
| - virtual void OnBackendInitialized(
|
| + void OnBackendInitialized(
|
| const syncer::WeakHandle<syncer::JsBackend>& js_backend,
|
| const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&
|
| debug_info_listener,
|
| const std::string& cache_guid,
|
| bool success) override;
|
| - virtual void OnSyncCycleCompleted() override;
|
| - virtual void OnProtocolEvent(const syncer::ProtocolEvent& event) override;
|
| - virtual void OnDirectoryTypeCommitCounterUpdated(
|
| + void OnSyncCycleCompleted() override;
|
| + void OnProtocolEvent(const syncer::ProtocolEvent& event) override;
|
| + void OnDirectoryTypeCommitCounterUpdated(
|
| syncer::ModelType type,
|
| const syncer::CommitCounters& counters) override;
|
| - virtual void OnDirectoryTypeUpdateCounterUpdated(
|
| + void OnDirectoryTypeUpdateCounterUpdated(
|
| syncer::ModelType type,
|
| const syncer::UpdateCounters& counters) override;
|
| - virtual void OnDirectoryTypeStatusCounterUpdated(
|
| + void OnDirectoryTypeStatusCounterUpdated(
|
| syncer::ModelType type,
|
| const syncer::StatusCounters& counters) override;
|
| - virtual void OnConnectionStatusChange(
|
| - syncer::ConnectionStatus status) override;
|
| - virtual void OnPassphraseRequired(
|
| + void OnConnectionStatusChange(syncer::ConnectionStatus status) override;
|
| + void OnPassphraseRequired(
|
| syncer::PassphraseRequiredReason reason,
|
| const sync_pb::EncryptedData& pending_keys) override;
|
| - virtual void OnPassphraseAccepted() override;
|
| - virtual void OnEncryptedTypesChanged(
|
| - syncer::ModelTypeSet encrypted_types,
|
| - bool encrypt_everything) override;
|
| - virtual void OnEncryptionComplete() override;
|
| - virtual void OnMigrationNeededForTypes(
|
| - syncer::ModelTypeSet types) override;
|
| - virtual void OnExperimentsChanged(
|
| - const syncer::Experiments& experiments) override;
|
| - virtual void OnActionableError(
|
| - const syncer::SyncProtocolError& error) override;
|
| + void OnPassphraseAccepted() override;
|
| + void OnEncryptedTypesChanged(syncer::ModelTypeSet encrypted_types,
|
| + bool encrypt_everything) override;
|
| + void OnEncryptionComplete() override;
|
| + void OnMigrationNeededForTypes(syncer::ModelTypeSet types) override;
|
| + void OnExperimentsChanged(const syncer::Experiments& experiments) override;
|
| + void OnActionableError(const syncer::SyncProtocolError& error) override;
|
|
|
| // DataTypeManagerObserver implementation.
|
| - virtual void OnConfigureDone(
|
| + void OnConfigureDone(
|
| const sync_driver::DataTypeManager::ConfigureResult& result) override;
|
| - virtual void OnConfigureStart() override;
|
| + void OnConfigureStart() override;
|
|
|
| // DataTypeEncryptionHandler implementation.
|
| - virtual bool IsPassphraseRequired() const override;
|
| - virtual syncer::ModelTypeSet GetEncryptedDataTypes() const override;
|
| + bool IsPassphraseRequired() const override;
|
| + syncer::ModelTypeSet GetEncryptedDataTypes() const override;
|
|
|
| // SigninManagerBase::Observer implementation.
|
| - virtual void GoogleSigninSucceeded(const std::string& account_id,
|
| - const std::string& username,
|
| - const std::string& password) override;
|
| - virtual void GoogleSignedOut(const std::string& account_id,
|
| - const std::string& username) override;
|
| + void GoogleSigninSucceeded(const std::string& account_id,
|
| + const std::string& username,
|
| + const std::string& password) override;
|
| + void GoogleSignedOut(const std::string& account_id,
|
| + const std::string& username) override;
|
|
|
| // Called when a user chooses which data types to sync as part of the sync
|
| // setup wizard. |sync_everything| represents whether they chose the
|
| @@ -541,9 +534,8 @@ class ProfileSyncService : public ProfileSyncServiceBase,
|
| virtual bool IsManaged() const;
|
|
|
| // syncer::UnrecoverableErrorHandler implementation.
|
| - virtual void OnUnrecoverableError(
|
| - const tracked_objects::Location& from_here,
|
| - const std::string& message) override;
|
| + void OnUnrecoverableError(const tracked_objects::Location& from_here,
|
| + const std::string& message) override;
|
|
|
| // Called to re-enable a type disabled by DisableDatatype(..). Note, this does
|
| // not change the preferred state of a datatype, and is not persisted across
|
| @@ -601,7 +593,7 @@ class ProfileSyncService : public ProfileSyncServiceBase,
|
| virtual void DeactivateDataType(syncer::ModelType type);
|
|
|
| // SyncPrefObserver implementation.
|
| - virtual void OnSyncManagedPrefChange(bool is_sync_managed) override;
|
| + void OnSyncManagedPrefChange(bool is_sync_managed) override;
|
|
|
| // Changes which data types we're going to be syncing to |preferred_types|.
|
| // If it is running, the DataTypeManager will be instructed to reconfigure
|
| @@ -727,22 +719,20 @@ class ProfileSyncService : public ProfileSyncServiceBase,
|
| const syncer::Experiments& current_experiments() const;
|
|
|
| // OAuth2TokenService::Consumer implementation.
|
| - virtual void OnGetTokenSuccess(
|
| - const OAuth2TokenService::Request* request,
|
| - const std::string& access_token,
|
| - const base::Time& expiration_time) override;
|
| - virtual void OnGetTokenFailure(
|
| - const OAuth2TokenService::Request* request,
|
| - const GoogleServiceAuthError& error) override;
|
| + void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
|
| + const std::string& access_token,
|
| + const base::Time& expiration_time) override;
|
| + void OnGetTokenFailure(const OAuth2TokenService::Request* request,
|
| + const GoogleServiceAuthError& error) override;
|
|
|
| // OAuth2TokenService::Observer implementation.
|
| - virtual void OnRefreshTokenAvailable(const std::string& account_id) override;
|
| - virtual void OnRefreshTokenRevoked(const std::string& account_id) override;
|
| - virtual void OnRefreshTokensLoaded() override;
|
| + void OnRefreshTokenAvailable(const std::string& account_id) override;
|
| + void OnRefreshTokenRevoked(const std::string& account_id) override;
|
| + void OnRefreshTokensLoaded() override;
|
|
|
| // KeyedService implementation. This must be called exactly
|
| // once (before this object is destroyed).
|
| - virtual void Shutdown() override;
|
| + void Shutdown() override;
|
|
|
| // Called when a datatype (SyncableService) has a need for sync to start
|
| // ASAP, presumably because a local change event has occurred but we're
|
|
|