summaryrefslogtreecommitdiffstats
path: root/components/ownership
diff options
context:
space:
mode:
Diffstat (limited to 'components/ownership')
-rw-r--r--components/ownership/mock_owner_key_util.h6
-rw-r--r--components/ownership/owner_key_util_impl.h6
-rw-r--r--components/ownership/owner_settings_service.h2
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();