| Index: content/renderer/media/crypto/encrypted_media_player_support_impl.h
|
| diff --git a/content/renderer/media/crypto/encrypted_media_player_support_impl.h b/content/renderer/media/crypto/encrypted_media_player_support_impl.h
|
| index 6943d449ae311f023220202d5b689d462c096a6d..d68d40b7d5a143c7f3420f6a21576bb1e4d1b438 100644
|
| --- a/content/renderer/media/crypto/encrypted_media_player_support_impl.h
|
| +++ b/content/renderer/media/crypto/encrypted_media_player_support_impl.h
|
| @@ -27,16 +27,16 @@ class EncryptedMediaPlayerSupportImpl
|
| static scoped_ptr<EncryptedMediaPlayerSupport> Create(
|
| blink::WebMediaPlayerClient* client);
|
|
|
| - virtual ~EncryptedMediaPlayerSupportImpl();
|
| + ~EncryptedMediaPlayerSupportImpl() override;
|
|
|
| // EncryptedMediaPlayerSupport implementation.
|
| - virtual blink::WebMediaPlayer::MediaKeyException GenerateKeyRequest(
|
| + blink::WebMediaPlayer::MediaKeyException GenerateKeyRequest(
|
| blink::WebLocalFrame* frame,
|
| const blink::WebString& key_system,
|
| const unsigned char* init_data,
|
| - unsigned init_data_length) override;
|
| + unsigned init_data_length) override;
|
|
|
| - virtual blink::WebMediaPlayer::MediaKeyException AddKey(
|
| + blink::WebMediaPlayer::MediaKeyException AddKey(
|
| const blink::WebString& key_system,
|
| const unsigned char* key,
|
| unsigned key_length,
|
| @@ -44,23 +44,23 @@ class EncryptedMediaPlayerSupportImpl
|
| unsigned init_data_length,
|
| const blink::WebString& session_id) override;
|
|
|
| - virtual blink::WebMediaPlayer::MediaKeyException CancelKeyRequest(
|
| + blink::WebMediaPlayer::MediaKeyException CancelKeyRequest(
|
| const blink::WebString& key_system,
|
| const blink::WebString& session_id) override;
|
|
|
| - virtual void SetInitialContentDecryptionModule(
|
| + void SetInitialContentDecryptionModule(
|
| blink::WebContentDecryptionModule* initial_cdm) override;
|
|
|
| - virtual void SetContentDecryptionModule(
|
| + void SetContentDecryptionModule(
|
| blink::WebContentDecryptionModule* cdm) override;
|
| - virtual void SetContentDecryptionModule(
|
| + void SetContentDecryptionModule(
|
| blink::WebContentDecryptionModule* cdm,
|
| blink::WebContentDecryptionModuleResult result) override;
|
|
|
| - virtual media::SetDecryptorReadyCB CreateSetDecryptorReadyCB() override;
|
| - virtual media::Demuxer::NeedKeyCB CreateNeedKeyCB() override;
|
| + media::SetDecryptorReadyCB CreateSetDecryptorReadyCB() override;
|
| + media::Demuxer::NeedKeyCB CreateNeedKeyCB() override;
|
|
|
| - virtual void OnPipelineDecryptError() override;
|
| + void OnPipelineDecryptError() override;
|
|
|
| private:
|
| explicit EncryptedMediaPlayerSupportImpl(blink::WebMediaPlayerClient* client);
|
|
|