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

Unified Diff: media/blink/null_encrypted_media_player_support.h

Issue 623263003: replace OVERRIDE and FINAL with override and 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/buffered_data_source_host_impl.h ('k') | media/blink/run_all_unittests.cc » ('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 615b893cb98944a984ef2e8801266b126da8e9df..2fe538787724a4ba095ddde88a24f08f56f9d9d6 100644
--- a/media/blink/null_encrypted_media_player_support.h
+++ b/media/blink/null_encrypted_media_player_support.h
@@ -26,7 +26,7 @@ class MEDIA_EXPORT NullEncryptedMediaPlayerSupport
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(
const blink::WebString& key_system,
@@ -34,21 +34,21 @@ class MEDIA_EXPORT NullEncryptedMediaPlayerSupport
unsigned key_length,
const unsigned char* init_data,
unsigned init_data_length,
- const blink::WebString& session_id) OVERRIDE;
+ const blink::WebString& session_id) override;
virtual blink::WebMediaPlayer::MediaKeyException CancelKeyRequest(
const blink::WebString& key_system,
- const blink::WebString& session_id) OVERRIDE;
+ const blink::WebString& session_id) override;
// Unprefixed API methods.
virtual void SetInitialContentDecryptionModule(
- blink::WebContentDecryptionModule* initial_cdm) OVERRIDE;
+ blink::WebContentDecryptionModule* initial_cdm) override;
virtual void SetContentDecryptionModule(
- blink::WebContentDecryptionModule* cdm) OVERRIDE;
+ blink::WebContentDecryptionModule* cdm) override;
virtual void SetContentDecryptionModule(
blink::WebContentDecryptionModule* cdm,
- blink::WebContentDecryptionModuleResult result) OVERRIDE;
+ blink::WebContentDecryptionModuleResult result) override;
// Callback factory and notification methods used by WebMediaPlayerImpl.
@@ -56,16 +56,16 @@ class MEDIA_EXPORT NullEncryptedMediaPlayerSupport
// 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;
+ virtual 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;
+ virtual SetDecryptorReadyCB CreateSetDecryptorReadyCB() override;
// Called to inform this object that the media pipeline encountered
// and handled a decryption error.
- virtual void OnPipelineDecryptError() OVERRIDE;
+ virtual void OnPipelineDecryptError() override;
private:
NullEncryptedMediaPlayerSupport();
« no previous file with comments | « media/blink/buffered_data_source_host_impl.h ('k') | media/blink/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698