diff options
author | dcheng <dcheng@chromium.org> | 2014-10-21 09:44:46 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-21 16:45:34 +0000 |
commit | 393acf28e5f1fd88de91c916c36d83d844021b0a (patch) | |
tree | eaba94612b4d1fd0feadef47c8b08476a72a4bc6 /sync/internal_api/sync_encryption_handler_impl.h | |
parent | 141df6d109aad65adba7a58f6522af415a586b7c (diff) | |
download | chromium_src-393acf28e5f1fd88de91c916c36d83d844021b0a.zip chromium_src-393acf28e5f1fd88de91c916c36d83d844021b0a.tar.gz chromium_src-393acf28e5f1fd88de91c916c36d83d844021b0a.tar.bz2 |
Standardize usage of virtual/override/final in sync/
This patch was automatically generated by applying clang fixit hints
generated by the plugin to the source tree.
BUG=417463
TBR=maniscalco@chromium.org
Review URL: https://codereview.chromium.org/642023004
Cr-Commit-Position: refs/heads/master@{#300499}
Diffstat (limited to 'sync/internal_api/sync_encryption_handler_impl.h')
-rw-r--r-- | sync/internal_api/sync_encryption_handler_impl.h | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/sync/internal_api/sync_encryption_handler_impl.h b/sync/internal_api/sync_encryption_handler_impl.h index 6cbf74ed..2db4c47 100644 --- a/sync/internal_api/sync_encryption_handler_impl.h +++ b/sync/internal_api/sync_encryption_handler_impl.h @@ -51,34 +51,32 @@ class SYNC_EXPORT_PRIVATE SyncEncryptionHandlerImpl Encryptor* encryptor, const std::string& restored_key_for_bootstrapping, const std::string& restored_keystore_key_for_bootstrapping); - virtual ~SyncEncryptionHandlerImpl(); + ~SyncEncryptionHandlerImpl() override; // SyncEncryptionHandler implementation. - virtual void AddObserver(Observer* observer) override; - virtual void RemoveObserver(Observer* observer) override; - virtual void Init() override; - virtual void SetEncryptionPassphrase(const std::string& passphrase, - bool is_explicit) override; - virtual void SetDecryptionPassphrase(const std::string& passphrase) override; - virtual void EnableEncryptEverything() override; - virtual bool EncryptEverythingEnabled() const override; - virtual PassphraseType GetPassphraseType() const override; + void AddObserver(Observer* observer) override; + void RemoveObserver(Observer* observer) override; + void Init() override; + void SetEncryptionPassphrase(const std::string& passphrase, + bool is_explicit) override; + void SetDecryptionPassphrase(const std::string& passphrase) override; + void EnableEncryptEverything() override; + bool EncryptEverythingEnabled() const override; + PassphraseType GetPassphraseType() const override; // NigoriHandler implementation. // Note: all methods are invoked while the caller holds a transaction. - virtual void ApplyNigoriUpdate( - const sync_pb::NigoriSpecifics& nigori, - syncable::BaseTransaction* const trans) override; - virtual void UpdateNigoriFromEncryptedTypes( + void ApplyNigoriUpdate(const sync_pb::NigoriSpecifics& nigori, + syncable::BaseTransaction* const trans) override; + void UpdateNigoriFromEncryptedTypes( sync_pb::NigoriSpecifics* nigori, syncable::BaseTransaction* const trans) const override; - virtual bool NeedKeystoreKey( - syncable::BaseTransaction* const trans) const override; - virtual bool SetKeystoreKeys( + bool NeedKeystoreKey(syncable::BaseTransaction* const trans) const override; + bool SetKeystoreKeys( const google::protobuf::RepeatedPtrField<google::protobuf::string>& keys, syncable::BaseTransaction* const trans) override; // Can be called from any thread. - virtual ModelTypeSet GetEncryptedTypes( + ModelTypeSet GetEncryptedTypes( syncable::BaseTransaction* const trans) const override; // Unsafe getters. Use only if sync is not up and running and there is no risk |