diff options
| author | dcheng <dcheng@chromium.org> | 2014-10-21 04:24:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-21 11:25:34 +0000 |
| commit | 00ea022b81af00857b352bae68d4ba2eb3e1493b (patch) | |
| tree | b5e3e536a25f154ab5410d611736832c11b2cfad /components/ownership | |
| parent | 0b0885ca539071e7864061fde54c7345a0fd2aae (diff) | |
| download | chromium_src-00ea022b81af00857b352bae68d4ba2eb3e1493b.zip chromium_src-00ea022b81af00857b352bae68d4ba2eb3e1493b.tar.gz chromium_src-00ea022b81af00857b352bae68d4ba2eb3e1493b.tar.bz2 | |
Standardize usage of virtual/override/final in components/
BUG=417463
TBR=blundell@chromium.org
Review URL: https://codereview.chromium.org/666133002
Cr-Commit-Position: refs/heads/master@{#300456}
Diffstat (limited to 'components/ownership')
| -rw-r--r-- | components/ownership/mock_owner_key_util.h | 6 | ||||
| -rw-r--r-- | components/ownership/owner_key_util_impl.h | 6 | ||||
| -rw-r--r-- | components/ownership/owner_settings_service.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/components/ownership/mock_owner_key_util.h b/components/ownership/mock_owner_key_util.h index 79e071b..7c4f9cd 100644 --- a/components/ownership/mock_owner_key_util.h +++ b/components/ownership/mock_owner_key_util.h @@ -23,13 +23,13 @@ class OWNERSHIP_EXPORT MockOwnerKeyUtil : public OwnerKeyUtil { MockOwnerKeyUtil(); // OwnerKeyUtil implementation: - virtual bool ImportPublicKey(std::vector<uint8>* output) override; + bool ImportPublicKey(std::vector<uint8>* output) override; #if defined(USE_NSS) virtual crypto::RSAPrivateKey* FindPrivateKeyInSlot( const std::vector<uint8>& key, PK11SlotInfo* slot) override; #endif // defined(USE_NSS) - virtual bool IsPublicKeyPresent() override; + bool IsPublicKeyPresent() override; // Clears the public and private keys. void Clear(); @@ -45,7 +45,7 @@ class OWNERSHIP_EXPORT MockOwnerKeyUtil : public OwnerKeyUtil { void SetPrivateKey(scoped_ptr<crypto::RSAPrivateKey> key); private: - virtual ~MockOwnerKeyUtil(); + ~MockOwnerKeyUtil() override; std::vector<uint8> public_key_; scoped_ptr<crypto::RSAPrivateKey> private_key_; diff --git a/components/ownership/owner_key_util_impl.h b/components/ownership/owner_key_util_impl.h index 1bd8c23..b6f18a7 100644 --- a/components/ownership/owner_key_util_impl.h +++ b/components/ownership/owner_key_util_impl.h @@ -20,16 +20,16 @@ class OWNERSHIP_EXPORT OwnerKeyUtilImpl : public OwnerKeyUtil { explicit OwnerKeyUtilImpl(const base::FilePath& public_key_file); // OwnerKeyUtil implementation: - virtual bool ImportPublicKey(std::vector<uint8>* output) override; + bool ImportPublicKey(std::vector<uint8>* output) override; #if defined(USE_NSS) virtual crypto::RSAPrivateKey* FindPrivateKeyInSlot( const std::vector<uint8>& key, PK11SlotInfo* slot) override; #endif // defined(USE_NSS) - virtual bool IsPublicKeyPresent() override; + bool IsPublicKeyPresent() override; private: - virtual ~OwnerKeyUtilImpl(); + ~OwnerKeyUtilImpl() override; // The file that holds the public key. base::FilePath public_key_file_; diff --git a/components/ownership/owner_settings_service.h b/components/ownership/owner_settings_service.h index ed4a1b5..1961975 100644 --- a/components/ownership/owner_settings_service.h +++ b/components/ownership/owner_settings_service.h @@ -38,7 +38,7 @@ class OWNERSHIP_EXPORT OwnerSettingsService : public KeyedService { explicit OwnerSettingsService( const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util); - virtual ~OwnerSettingsService(); + ~OwnerSettingsService() override; base::WeakPtr<OwnerSettingsService> as_weak_ptr() { return weak_factory_.GetWeakPtr(); |