Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6806)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chromeos/dbus/cryptohome_client.cc

Issue 628883002: replace OVERRIDE and FINAL with override and final in chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/cros_disks_client.cc ('k') | chromeos/dbus/debug_daemon_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/cryptohome_client.cc
diff --git a/chromeos/dbus/cryptohome_client.cc b/chromeos/dbus/cryptohome_client.cc
index 16bf4ed1102ed79b155becd40a7976f92a390648..ed5763a3bfa01c5fc1433171b304420be24e0386 100644
--- a/chromeos/dbus/cryptohome_client.cc
+++ b/chromeos/dbus/cryptohome_client.cc
@@ -39,32 +39,32 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual void SetAsyncCallStatusHandlers(
const AsyncCallStatusHandler& handler,
- const AsyncCallStatusWithDataHandler& data_handler) OVERRIDE {
+ const AsyncCallStatusWithDataHandler& data_handler) override {
async_call_status_handler_ = handler;
async_call_status_data_handler_ = data_handler;
}
// CryptohomeClient override.
- virtual void ResetAsyncCallStatusHandlers() OVERRIDE {
+ virtual void ResetAsyncCallStatusHandlers() override {
async_call_status_handler_.Reset();
async_call_status_data_handler_.Reset();
}
// CryptohomeClient override.
virtual void WaitForServiceToBeAvailable(
- const WaitForServiceToBeAvailableCallback& callback) OVERRIDE {
+ const WaitForServiceToBeAvailableCallback& callback) override {
proxy_->WaitForServiceToBeAvailable(callback);
}
// CryptohomeClient override.
- virtual void IsMounted(const BoolDBusMethodCallback& callback) OVERRIDE {
+ virtual void IsMounted(const BoolDBusMethodCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeIsMounted);
CallBoolMethod(&method_call, callback);
}
// CryptohomeClient override.
- virtual bool Unmount(bool *success) OVERRIDE {
+ virtual bool Unmount(bool *success) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeUnmount);
return CallBoolMethodAndBlock(&method_call, success);
@@ -73,7 +73,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual void AsyncCheckKey(const std::string& username,
const std::string& key,
- const AsyncMethodCallback& callback) OVERRIDE {
+ const AsyncMethodCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeAsyncCheckKey);
dbus::MessageWriter writer(&method_call);
@@ -89,7 +89,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
virtual void AsyncMigrateKey(const std::string& username,
const std::string& from_key,
const std::string& to_key,
- const AsyncMethodCallback& callback) OVERRIDE {
+ const AsyncMethodCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeAsyncMigrateKey);
dbus::MessageWriter writer(&method_call);
@@ -104,7 +104,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual void AsyncRemove(const std::string& username,
- const AsyncMethodCallback& callback) OVERRIDE {
+ const AsyncMethodCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeAsyncRemove);
dbus::MessageWriter writer(&method_call);
@@ -116,7 +116,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
}
// CryptohomeClient override.
- virtual void GetSystemSalt(const GetSystemSaltCallback& callback) OVERRIDE {
+ virtual void GetSystemSalt(const GetSystemSaltCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeGetSystemSalt);
proxy_->CallMethod(&method_call, kTpmDBusTimeoutMs ,
@@ -128,7 +128,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override,
virtual void GetSanitizedUsername(
const std::string& username,
- const StringDBusMethodCallback& callback) OVERRIDE {
+ const StringDBusMethodCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeGetSanitizedUsername);
dbus::MessageWriter writer(&method_call);
@@ -141,7 +141,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual std::string BlockingGetSanitizedUsername(
- const std::string& username) OVERRIDE {
+ const std::string& username) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeGetSanitizedUsername);
dbus::MessageWriter writer(&method_call);
@@ -163,7 +163,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
virtual void AsyncMount(const std::string& username,
const std::string& key,
int flags,
- const AsyncMethodCallback& callback) OVERRIDE {
+ const AsyncMethodCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeAsyncMount);
dbus::MessageWriter writer(&method_call);
@@ -183,7 +183,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
virtual void AsyncAddKey(const std::string& username,
const std::string& key,
const std::string& new_key,
- const AsyncMethodCallback& callback) OVERRIDE {
+ const AsyncMethodCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeAsyncAddKey);
dbus::MessageWriter writer(&method_call);
@@ -197,7 +197,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
}
// CryptohomeClient override.
- virtual void AsyncMountGuest(const AsyncMethodCallback& callback) OVERRIDE {
+ virtual void AsyncMountGuest(const AsyncMethodCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeAsyncMountGuest);
proxy_->CallMethod(&method_call, kTpmDBusTimeoutMs ,
@@ -209,7 +209,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual void AsyncMountPublic(const std::string& public_mount_id,
int flags,
- const AsyncMethodCallback& callback) OVERRIDE {
+ const AsyncMethodCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeAsyncMountPublic);
dbus::MessageWriter writer(&method_call);
@@ -223,14 +223,14 @@ class CryptohomeClientImpl : public CryptohomeClient {
}
// CryptohomeClient override.
- virtual void TpmIsReady(const BoolDBusMethodCallback& callback) OVERRIDE {
+ virtual void TpmIsReady(const BoolDBusMethodCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmIsReady);
CallBoolMethod(&method_call, callback);
}
// CryptohomeClient override.
- virtual void TpmIsEnabled(const BoolDBusMethodCallback& callback) OVERRIDE {
+ virtual void TpmIsEnabled(const BoolDBusMethodCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmIsEnabled);
CallBoolMethod(&method_call, callback);
@@ -238,7 +238,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
// TODO(hashimoto): Remove this method. crbug.com/141006
- virtual bool CallTpmIsEnabledAndBlock(bool* enabled) OVERRIDE {
+ virtual bool CallTpmIsEnabledAndBlock(bool* enabled) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmIsEnabled);
return CallBoolMethodAndBlock(&method_call, enabled);
@@ -246,7 +246,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual void TpmGetPassword(
- const StringDBusMethodCallback& callback) OVERRIDE {
+ const StringDBusMethodCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmGetPassword);
proxy_->CallMethod(
@@ -257,7 +257,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
}
// CryptohomeClient override.
- virtual void TpmIsOwned(const BoolDBusMethodCallback& callback) OVERRIDE {
+ virtual void TpmIsOwned(const BoolDBusMethodCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmIsOwned);
CallBoolMethod(&method_call, callback);
@@ -265,7 +265,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
// TODO(hashimoto): Remove this method. crbug.com/141012
- virtual bool CallTpmIsOwnedAndBlock(bool* owned) OVERRIDE {
+ virtual bool CallTpmIsOwnedAndBlock(bool* owned) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmIsOwned);
return CallBoolMethodAndBlock(&method_call, owned);
@@ -273,7 +273,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual void TpmIsBeingOwned(const BoolDBusMethodCallback& callback)
- OVERRIDE {
+ override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmIsBeingOwned);
CallBoolMethod(&method_call, callback);
@@ -281,7 +281,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
// TODO(hashimoto): Remove this method. crbug.com/141011
- virtual bool CallTpmIsBeingOwnedAndBlock(bool* owning) OVERRIDE {
+ virtual bool CallTpmIsBeingOwnedAndBlock(bool* owning) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmIsBeingOwned);
return CallBoolMethodAndBlock(&method_call, owning);
@@ -289,7 +289,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual void TpmCanAttemptOwnership(
- const VoidDBusMethodCallback& callback) OVERRIDE {
+ const VoidDBusMethodCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmCanAttemptOwnership);
CallVoidMethod(&method_call, callback);
@@ -297,7 +297,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient overrides.
virtual void TpmClearStoredPassword(const VoidDBusMethodCallback& callback)
- OVERRIDE {
+ override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmClearStoredPassword);
CallVoidMethod(&method_call, callback);
@@ -305,7 +305,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
// TODO(hashimoto): Remove this method. crbug.com/141010
- virtual bool CallTpmClearStoredPasswordAndBlock() OVERRIDE {
+ virtual bool CallTpmClearStoredPasswordAndBlock() override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmClearStoredPassword);
scoped_ptr<dbus::Response> response(
@@ -315,7 +315,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual void Pkcs11IsTpmTokenReady(const BoolDBusMethodCallback& callback)
- OVERRIDE {
+ override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomePkcs11IsTpmTokenReady);
CallBoolMethod(&method_call, callback);
@@ -323,7 +323,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual void Pkcs11GetTpmTokenInfo(
- const Pkcs11GetTpmTokenInfoCallback& callback) OVERRIDE {
+ const Pkcs11GetTpmTokenInfoCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomePkcs11GetTpmTokenInfo);
proxy_->CallMethod(
@@ -337,7 +337,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual void Pkcs11GetTpmTokenInfoForUser(
const std::string& user_email,
- const Pkcs11GetTpmTokenInfoCallback& callback) OVERRIDE {
+ const Pkcs11GetTpmTokenInfoCallback& callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomePkcs11GetTpmTokenInfoForUser);
@@ -354,7 +354,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual bool InstallAttributesGet(const std::string& name,
std::vector<uint8>* value,
- bool* successful) OVERRIDE {
+ bool* successful) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeInstallAttributesGet);
dbus::MessageWriter writer(&method_call);
@@ -376,7 +376,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual bool InstallAttributesSet(const std::string& name,
const std::vector<uint8>& value,
- bool* successful) OVERRIDE {
+ bool* successful) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeInstallAttributesSet);
dbus::MessageWriter writer(&method_call);
@@ -386,7 +386,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
}
// CryptohomeClient override.
- virtual bool InstallAttributesFinalize(bool* successful) OVERRIDE {
+ virtual bool InstallAttributesFinalize(bool* successful) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeInstallAttributesFinalize);
@@ -395,7 +395,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual void InstallAttributesIsReady(const BoolDBusMethodCallback& callback)
- OVERRIDE {
+ override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeInstallAttributesIsReady);
@@ -403,7 +403,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
}
// CryptohomeClient override.
- virtual bool InstallAttributesIsInvalid(bool* is_invalid) OVERRIDE {
+ virtual bool InstallAttributesIsInvalid(bool* is_invalid) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeInstallAttributesIsInvalid);
@@ -412,7 +412,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual bool InstallAttributesIsFirstInstall(
- bool* is_first_install) OVERRIDE {
+ bool* is_first_install) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeInstallAttributesIsFirstInstall);
@@ -421,7 +421,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual void TpmAttestationIsPrepared(
- const BoolDBusMethodCallback& callback) OVERRIDE {
+ const BoolDBusMethodCallback& callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmIsAttestationPrepared);
@@ -430,7 +430,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual void TpmAttestationIsEnrolled(
- const BoolDBusMethodCallback& callback) OVERRIDE {
+ const BoolDBusMethodCallback& callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmIsAttestationEnrolled);
@@ -440,7 +440,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
// CryptohomeClient override.
virtual void AsyncTpmAttestationCreateEnrollRequest(
attestation::PrivacyCAType pca_type,
- const AsyncMethodCallback& callback) OVERRIDE {
+ const AsyncMethodCallback& callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeAsyncTpmAttestationCreateEnrollRequest);
@@ -456,7 +456,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
virtual void AsyncTpmAttestationEnroll(
attestation::PrivacyCAType pca_type,
const std::string& pca_response,
- const AsyncMethodCallback& callback) OVERRIDE {
+ const AsyncMethodCallback& callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeAsyncTpmAttestationEnroll);
@@ -477,7 +477,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
attestation::AttestationCertificateProfile certificate_profile,
const std::string& user_id,
const std::string& request_origin,
- const AsyncMethodCallback& callback) OVERRIDE {
+ const AsyncMethodCallback& callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeAsyncTpmAttestationCreateCertRequest);
@@ -498,7 +498,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
attestation::AttestationKeyType key_type,
const std::string& user_id,
const std::string& key_name,
- const AsyncMethodCallback& callback) OVERRIDE {
+ const AsyncMethodCallback& callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeAsyncTpmAttestationFinishCertRequest);
@@ -521,7 +521,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
attestation::AttestationKeyType key_type,
const std::string& user_id,
const std::string& key_name,
- const BoolDBusMethodCallback& callback) OVERRIDE {
+ const BoolDBusMethodCallback& callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmAttestationDoesKeyExist);
@@ -538,7 +538,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
attestation::AttestationKeyType key_type,
const std::string& user_id,
const std::string& key_name,
- const DataMethodCallback& callback) OVERRIDE {
+ const DataMethodCallback& callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmAttestationGetCertificate);
@@ -558,7 +558,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
attestation::AttestationKeyType key_type,
const std::string& user_id,
const std::string& key_name,
- const DataMethodCallback& callback) OVERRIDE {
+ const DataMethodCallback& callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmAttestationGetPublicKey);
@@ -578,7 +578,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
attestation::AttestationKeyType key_type,
const std::string& user_id,
const std::string& key_name,
- const AsyncMethodCallback& callback) OVERRIDE {
+ const AsyncMethodCallback& callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmAttestationRegisterKey);
@@ -602,7 +602,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
const std::string& device_id,
attestation::AttestationChallengeOptions options,
const std::string& challenge,
- const AsyncMethodCallback& callback) OVERRIDE {
+ const AsyncMethodCallback& callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmAttestationSignEnterpriseChallenge);
@@ -631,7 +631,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
const std::string& user_id,
const std::string& key_name,
const std::string& challenge,
- const AsyncMethodCallback& callback) OVERRIDE {
+ const AsyncMethodCallback& callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmAttestationSignSimpleChallenge);
@@ -653,7 +653,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
attestation::AttestationKeyType key_type,
const std::string& user_id,
const std::string& key_name,
- const DataMethodCallback& callback) OVERRIDE {
+ const DataMethodCallback& callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmAttestationGetKeyPayload);
@@ -674,7 +674,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
const std::string& user_id,
const std::string& key_name,
const std::string& payload,
- const BoolDBusMethodCallback& callback) OVERRIDE {
+ const BoolDBusMethodCallback& callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmAttestationSetKeyPayload);
@@ -693,7 +693,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
attestation::AttestationKeyType key_type,
const std::string& user_id,
const std::string& key_prefix,
- const BoolDBusMethodCallback& callback) OVERRIDE {
+ const BoolDBusMethodCallback& callback) override {
dbus::MethodCall method_call(
cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmAttestationDeleteKeys);
@@ -709,7 +709,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
const cryptohome::AccountIdentifier& id,
const cryptohome::AuthorizationRequest& auth,
const cryptohome::GetKeyDataRequest& request,
- const ProtobufMethodCallback& callback) OVERRIDE {
+ const ProtobufMethodCallback& callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeGetKeyDataEx);
dbus::MessageWriter writer(&method_call);
@@ -728,7 +728,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
const cryptohome::AccountIdentifier& id,
const cryptohome::AuthorizationRequest& auth,
const cryptohome::CheckKeyRequest& request,
- const ProtobufMethodCallback& callback) OVERRIDE {
+ const ProtobufMethodCallback& callback) override {
const char* method_name = cryptohome::kCryptohomeCheckKeyEx;
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
method_name);
@@ -748,7 +748,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
const cryptohome::AccountIdentifier& id,
const cryptohome::AuthorizationRequest& auth,
const cryptohome::MountRequest& request,
- const ProtobufMethodCallback& callback) OVERRIDE {
+ const ProtobufMethodCallback& callback) override {
const char* method_name = cryptohome::kCryptohomeMountEx;
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
method_name);
@@ -768,7 +768,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
const cryptohome::AccountIdentifier& id,
const cryptohome::AuthorizationRequest& auth,
const cryptohome::AddKeyRequest& request,
- const ProtobufMethodCallback& callback) OVERRIDE {
+ const ProtobufMethodCallback& callback) override {
const char* method_name = cryptohome::kCryptohomeAddKeyEx;
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
method_name);
@@ -788,7 +788,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
const cryptohome::AccountIdentifier& id,
const cryptohome::AuthorizationRequest& auth,
const cryptohome::UpdateKeyRequest& request,
- const ProtobufMethodCallback& callback) OVERRIDE {
+ const ProtobufMethodCallback& callback) override {
const char* method_name = cryptohome::kCryptohomeUpdateKeyEx;
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
method_name);
@@ -808,7 +808,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
virtual void RemoveKeyEx(const cryptohome::AccountIdentifier& id,
const cryptohome::AuthorizationRequest& auth,
const cryptohome::RemoveKeyRequest& request,
- const ProtobufMethodCallback& callback) OVERRIDE {
+ const ProtobufMethodCallback& callback) override {
const char* method_name = cryptohome::kCryptohomeRemoveKeyEx;
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, method_name);
@@ -826,7 +826,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
virtual void GetBootAttribute(
const cryptohome::GetBootAttributeRequest& request,
- const ProtobufMethodCallback& callback) OVERRIDE {
+ const ProtobufMethodCallback& callback) override {
const char* method_name = cryptohome::kCryptohomeGetBootAttribute;
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, method_name);
@@ -842,7 +842,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
virtual void SetBootAttribute(
const cryptohome::SetBootAttributeRequest& request,
- const ProtobufMethodCallback& callback) OVERRIDE {
+ const ProtobufMethodCallback& callback) override {
const char* method_name = cryptohome::kCryptohomeSetBootAttribute;
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, method_name);
@@ -858,7 +858,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
virtual void FlushAndSignBootAttributes(
const cryptohome::FlushAndSignBootAttributesRequest& request,
- const ProtobufMethodCallback& callback) OVERRIDE {
+ const ProtobufMethodCallback& callback) override {
const char* method_name = cryptohome::kCryptohomeFlushAndSignBootAttributes;
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, method_name);
@@ -873,7 +873,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
}
protected:
- virtual void Init(dbus::Bus* bus) OVERRIDE {
+ virtual void Init(dbus::Bus* bus) override {
proxy_ = bus->GetObjectProxy(
cryptohome::kCryptohomeServiceName,
dbus::ObjectPath(cryptohome::kCryptohomeServicePath));
« no previous file with comments | « chromeos/dbus/cros_disks_client.cc ('k') | chromeos/dbus/debug_daemon_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698