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

Unified Diff: media/cdm/aes_decryptor.h

Issue 655713003: Standardize usage of virtual/override/final in media/ (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 | « media/cast/test/utility/udp_proxy_main.cc ('k') | media/cdm/player_tracker_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/aes_decryptor.h
diff --git a/media/cdm/aes_decryptor.h b/media/cdm/aes_decryptor.h
index 1275dd5321dc4e9fe8a2beb1f01d42621742b786..edae707b73a841d3cbac04478a46128fadf35c82 100644
--- a/media/cdm/aes_decryptor.h
+++ b/media/cdm/aes_decryptor.h
@@ -30,54 +30,51 @@ class MEDIA_EXPORT AesDecryptor : public MediaKeys, public Decryptor {
AesDecryptor(const SessionMessageCB& session_message_cb,
const SessionClosedCB& session_closed_cb,
const SessionKeysChangeCB& session_keys_change_cb);
- virtual ~AesDecryptor();
+ ~AesDecryptor() override;
// MediaKeys implementation.
- virtual void SetServerCertificate(
- const uint8* certificate_data,
- int certificate_data_length,
- scoped_ptr<SimpleCdmPromise> promise) override;
- virtual void CreateSession(const std::string& init_data_type,
- const uint8* init_data,
- int init_data_length,
- SessionType session_type,
- scoped_ptr<NewSessionCdmPromise> promise) override;
- virtual void LoadSession(const std::string& web_session_id,
- scoped_ptr<NewSessionCdmPromise> promise) override;
- virtual void UpdateSession(const std::string& web_session_id,
- const uint8* response,
- int response_length,
- scoped_ptr<SimpleCdmPromise> promise) override;
- virtual void CloseSession(const std::string& web_session_id,
+ void SetServerCertificate(const uint8* certificate_data,
+ int certificate_data_length,
scoped_ptr<SimpleCdmPromise> promise) override;
- virtual void RemoveSession(const std::string& web_session_id,
- scoped_ptr<SimpleCdmPromise> promise) override;
- virtual void GetUsableKeyIds(const std::string& web_session_id,
- scoped_ptr<KeyIdsPromise> promise) override;
- virtual Decryptor* GetDecryptor() override;
+ void CreateSession(const std::string& init_data_type,
+ const uint8* init_data,
+ int init_data_length,
+ SessionType session_type,
+ scoped_ptr<NewSessionCdmPromise> promise) override;
+ void LoadSession(const std::string& web_session_id,
+ scoped_ptr<NewSessionCdmPromise> promise) override;
+ void UpdateSession(const std::string& web_session_id,
+ const uint8* response,
+ int response_length,
+ scoped_ptr<SimpleCdmPromise> promise) override;
+ void CloseSession(const std::string& web_session_id,
+ scoped_ptr<SimpleCdmPromise> promise) override;
+ void RemoveSession(const std::string& web_session_id,
+ scoped_ptr<SimpleCdmPromise> promise) override;
+ void GetUsableKeyIds(const std::string& web_session_id,
+ scoped_ptr<KeyIdsPromise> promise) override;
+ Decryptor* GetDecryptor() override;
#if defined(ENABLE_BROWSER_CDMS)
virtual int GetCdmId() const override;
#endif // defined(ENABLE_BROWSER_CDMS)
// Decryptor implementation.
- virtual void RegisterNewKeyCB(StreamType stream_type,
- const NewKeyCB& key_added_cb) override;
- virtual void Decrypt(StreamType stream_type,
- const scoped_refptr<DecoderBuffer>& encrypted,
- const DecryptCB& decrypt_cb) override;
- virtual void CancelDecrypt(StreamType stream_type) override;
- virtual void InitializeAudioDecoder(const AudioDecoderConfig& config,
- const DecoderInitCB& init_cb) override;
- virtual void InitializeVideoDecoder(const VideoDecoderConfig& config,
- const DecoderInitCB& init_cb) override;
- virtual void DecryptAndDecodeAudio(
- const scoped_refptr<DecoderBuffer>& encrypted,
- const AudioDecodeCB& audio_decode_cb) override;
- virtual void DecryptAndDecodeVideo(
- const scoped_refptr<DecoderBuffer>& encrypted,
- const VideoDecodeCB& video_decode_cb) override;
- virtual void ResetDecoder(StreamType stream_type) override;
- virtual void DeinitializeDecoder(StreamType stream_type) override;
+ void RegisterNewKeyCB(StreamType stream_type,
+ const NewKeyCB& key_added_cb) override;
+ void Decrypt(StreamType stream_type,
+ const scoped_refptr<DecoderBuffer>& encrypted,
+ const DecryptCB& decrypt_cb) override;
+ void CancelDecrypt(StreamType stream_type) override;
+ void InitializeAudioDecoder(const AudioDecoderConfig& config,
+ const DecoderInitCB& init_cb) override;
+ void InitializeVideoDecoder(const VideoDecoderConfig& config,
+ const DecoderInitCB& init_cb) override;
+ void DecryptAndDecodeAudio(const scoped_refptr<DecoderBuffer>& encrypted,
+ const AudioDecodeCB& audio_decode_cb) override;
+ void DecryptAndDecodeVideo(const scoped_refptr<DecoderBuffer>& encrypted,
+ const VideoDecodeCB& video_decode_cb) override;
+ void ResetDecoder(StreamType stream_type) override;
+ void DeinitializeDecoder(StreamType stream_type) override;
private:
// TODO(fgalligan): Remove this and change KeyMap to use crypto::SymmetricKey
« no previous file with comments | « media/cast/test/utility/udp_proxy_main.cc ('k') | media/cdm/player_tracker_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698