| Index: media/blink/null_encrypted_media_player_support.h
|
| diff --git a/media/blink/null_encrypted_media_player_support.h b/media/blink/null_encrypted_media_player_support.h
|
| index 2fe538787724a4ba095ddde88a24f08f56f9d9d6..3b53ad24ab28f7857c0edede0f55915146c61527 100644
|
| --- a/media/blink/null_encrypted_media_player_support.h
|
| +++ b/media/blink/null_encrypted_media_player_support.h
|
| @@ -19,16 +19,16 @@ class MEDIA_EXPORT NullEncryptedMediaPlayerSupport
|
| static scoped_ptr<EncryptedMediaPlayerSupport> Create(
|
| blink::WebMediaPlayerClient* client);
|
|
|
| - virtual ~NullEncryptedMediaPlayerSupport();
|
| + ~NullEncryptedMediaPlayerSupport() override;
|
|
|
| // Prefixed API methods.
|
| - 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;
|
|
|
| - virtual blink::WebMediaPlayer::MediaKeyException AddKey(
|
| + blink::WebMediaPlayer::MediaKeyException AddKey(
|
| const blink::WebString& key_system,
|
| const unsigned char* key,
|
| unsigned key_length,
|
| @@ -36,36 +36,34 @@ class MEDIA_EXPORT NullEncryptedMediaPlayerSupport
|
| 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;
|
|
|
| -
|
| // Unprefixed API methods.
|
| - 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;
|
|
|
| -
|
| // Callback factory and notification methods used by WebMediaPlayerImpl.
|
|
|
| // Creates a callback that Demuxers can use to signal that the content
|
| // requires a key. This method makes sure the callback returned can be safely
|
| // invoked from any thread.
|
| - virtual Demuxer::NeedKeyCB CreateNeedKeyCB() override;
|
| + Demuxer::NeedKeyCB CreateNeedKeyCB() override;
|
|
|
| // Creates a callback that renderers can use to set decryptor
|
| // ready callback. This method makes sure the callback returned can be safely
|
| // invoked from any thread.
|
| - virtual SetDecryptorReadyCB CreateSetDecryptorReadyCB() override;
|
| + SetDecryptorReadyCB CreateSetDecryptorReadyCB() override;
|
|
|
| // Called to inform this object that the media pipeline encountered
|
| // and handled a decryption error.
|
| - virtual void OnPipelineDecryptError() override;
|
| + void OnPipelineDecryptError() override;
|
|
|
| private:
|
| NullEncryptedMediaPlayerSupport();
|
|
|