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

Unified Diff: media/blink/null_encrypted_media_player_support.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/blink/new_session_cdm_result_promise.h ('k') | media/blink/texttrack_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « media/blink/new_session_cdm_result_promise.h ('k') | media/blink/texttrack_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698