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

Unified Diff: content/renderer/media/crypto/encrypted_media_player_support_impl.h

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (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
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 788747f48d245a3e5f662aca6e04d18e6c9b32f1..6943d449ae311f023220202d5b689d462c096a6d 100644
--- a/content/renderer/media/crypto/encrypted_media_player_support_impl.h
+++ b/content/renderer/media/crypto/encrypted_media_player_support_impl.h
@@ -34,7 +34,7 @@ class EncryptedMediaPlayerSupportImpl
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,
@@ -42,25 +42,25 @@ class EncryptedMediaPlayerSupportImpl
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;
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;
- virtual media::SetDecryptorReadyCB CreateSetDecryptorReadyCB() OVERRIDE;
- virtual media::Demuxer::NeedKeyCB CreateNeedKeyCB() OVERRIDE;
+ virtual media::SetDecryptorReadyCB CreateSetDecryptorReadyCB() override;
+ virtual media::Demuxer::NeedKeyCB CreateNeedKeyCB() override;
- virtual void OnPipelineDecryptError() OVERRIDE;
+ virtual void OnPipelineDecryptError() override;
private:
explicit EncryptedMediaPlayerSupportImpl(blink::WebMediaPlayerClient* client);
« no previous file with comments | « content/renderer/media/audio_message_filter_unittest.cc ('k') | content/renderer/media/crypto/key_systems_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698