diff options
author | dmichael <dmichael@chromium.org> | 2014-12-19 13:38:40 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-19 21:39:26 +0000 |
commit | 5c2a4caa4e3eb8352167a647c48bb7ef0d78d00d (patch) | |
tree | 63a3e78d1a7eb9596fe55db75d94a82963ca2a9e /media | |
parent | 793993c8b144b9006a54b960e6dfb21450851737 (diff) | |
download | chromium_src-5c2a4caa4e3eb8352167a647c48bb7ef0d78d00d.zip chromium_src-5c2a4caa4e3eb8352167a647c48bb7ef0d78d00d.tar.gz chromium_src-5c2a4caa4e3eb8352167a647c48bb7ef0d78d00d.tar.bz2 |
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}
Diffstat (limited to 'media')
-rw-r--r-- | media/base/cdm_promise.h | 2 | ||||
-rw-r--r-- | media/blink/cdm_result_promise.h | 10 |
2 files changed, 6 insertions, 6 deletions
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<T...>::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<T...> { public: CdmResultPromise(const blink::WebContentDecryptionModuleResult& result, const std::string& uma_name); - virtual ~CdmResultPromise(); + ~CdmResultPromise() override; // CdmPromiseTemplate<T> 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<T...>::MarkPromiseSettled; |