From 5c2a4caa4e3eb8352167a647c48bb7ef0d78d00d Mon Sep 17 00:00:00 2001 From: dmichael Date: Fri, 19 Dec 2014 13:38:40 -0800 Subject: Fix some override usage in media/ Currently, the Clang style checker ignores templates. In order to turn it on, we first must fix latent style violations. This CL covers media/ BUG=441916 R=dalecurtis@chromium.org Review URL: https://codereview.chromium.org/820733002 Cr-Commit-Position: refs/heads/master@{#309268} --- media/base/cdm_promise.h | 2 +- media/blink/cdm_result_promise.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'media') diff --git a/media/base/cdm_promise.h b/media/base/cdm_promise.h index df8a752..783d688d 100644 --- a/media/base/cdm_promise.h +++ b/media/base/cdm_promise.h @@ -96,7 +96,7 @@ class MEDIA_EXPORT CdmPromiseTemplate : public CdmPromise { uint32 system_code, const std::string& error_message) = 0; - virtual ResolveParameterType GetResolveParameterType() const override { + ResolveParameterType GetResolveParameterType() const override { return CdmPromiseTraits::kType; } diff --git a/media/blink/cdm_result_promise.h b/media/blink/cdm_result_promise.h index ed4105c..e59ea1c 100644 --- a/media/blink/cdm_result_promise.h +++ b/media/blink/cdm_result_promise.h @@ -26,13 +26,13 @@ class CdmResultPromise : public media::CdmPromiseTemplate { public: CdmResultPromise(const blink::WebContentDecryptionModuleResult& result, const std::string& uma_name); - virtual ~CdmResultPromise(); + ~CdmResultPromise() override; // CdmPromiseTemplate implementation. - virtual void resolve(const T&... result) override; - virtual void reject(media::MediaKeys::Exception exception_code, - uint32 system_code, - const std::string& error_message) override; + void resolve(const T&... result) override; + void reject(media::MediaKeys::Exception exception_code, + uint32 system_code, + const std::string& error_message) override; private: using media::CdmPromiseTemplate::MarkPromiseSettled; -- cgit v1.1