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

Unified Diff: media/cdm/ppapi/external_clear_key/clear_key_cdm.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/cdm/ppapi/cdm_wrapper.h ('k') | media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/ppapi/external_clear_key/clear_key_cdm.h
diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h
index 19d41f89e0e58278235ff167d7854a34ea20fdc0..f75dcc55d175b73634642d3f203cd357bc70d38f 100644
--- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h
+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h
@@ -40,48 +40,48 @@ class ClearKeyCdm : public ClearKeyCdmInterface {
uint32 init_data_type_size,
const uint8* init_data,
uint32 init_data_size,
- cdm::SessionType session_type) OVERRIDE;
+ cdm::SessionType session_type) override;
virtual void LoadSession(uint32 promise_id,
const char* web_session_id,
- uint32_t web_session_id_length) OVERRIDE;
+ uint32_t web_session_id_length) override;
virtual void UpdateSession(uint32 promise_id,
const char* web_session_id,
uint32_t web_session_id_length,
const uint8* response,
- uint32 response_size) OVERRIDE;
+ uint32 response_size) override;
virtual void CloseSession(uint32 promise_id,
const char* web_session_id,
- uint32_t web_session_id_length) OVERRIDE;
+ uint32_t web_session_id_length) override;
virtual void RemoveSession(uint32 promise_id,
const char* web_session_id,
- uint32_t web_session_id_length) OVERRIDE;
+ uint32_t web_session_id_length) override;
virtual void GetUsableKeyIds(uint32_t promise_id,
const char* web_session_id,
- uint32_t web_session_id_length) OVERRIDE;
+ uint32_t web_session_id_length) override;
virtual void SetServerCertificate(
uint32 promise_id,
const uint8_t* server_certificate_data,
- uint32_t server_certificate_data_size) OVERRIDE;
- virtual void TimerExpired(void* context) OVERRIDE;
+ uint32_t server_certificate_data_size) override;
+ virtual void TimerExpired(void* context) override;
virtual cdm::Status Decrypt(const cdm::InputBuffer& encrypted_buffer,
- cdm::DecryptedBlock* decrypted_block) OVERRIDE;
+ cdm::DecryptedBlock* decrypted_block) override;
virtual cdm::Status InitializeAudioDecoder(
- const cdm::AudioDecoderConfig& audio_decoder_config) OVERRIDE;
+ const cdm::AudioDecoderConfig& audio_decoder_config) override;
virtual cdm::Status InitializeVideoDecoder(
- const cdm::VideoDecoderConfig& video_decoder_config) OVERRIDE;
- virtual void DeinitializeDecoder(cdm::StreamType decoder_type) OVERRIDE;
- virtual void ResetDecoder(cdm::StreamType decoder_type) OVERRIDE;
+ const cdm::VideoDecoderConfig& video_decoder_config) override;
+ virtual void DeinitializeDecoder(cdm::StreamType decoder_type) override;
+ virtual void ResetDecoder(cdm::StreamType decoder_type) override;
virtual cdm::Status DecryptAndDecodeFrame(
const cdm::InputBuffer& encrypted_buffer,
- cdm::VideoFrame* video_frame) OVERRIDE;
+ cdm::VideoFrame* video_frame) override;
virtual cdm::Status DecryptAndDecodeSamples(
const cdm::InputBuffer& encrypted_buffer,
- cdm::AudioFrames* audio_frames) OVERRIDE;
- virtual void Destroy() OVERRIDE;
+ cdm::AudioFrames* audio_frames) override;
+ virtual void Destroy() override;
virtual void OnPlatformChallengeResponse(
- const cdm::PlatformChallengeResponse& response) OVERRIDE;
+ const cdm::PlatformChallengeResponse& response) override;
virtual void OnQueryOutputProtectionStatus(
- uint32_t link_mask, uint32_t output_protection_mask) OVERRIDE;
+ uint32_t link_mask, uint32_t output_protection_mask) override;
private:
// Emulates a session stored for |session_id_for_emulated_loadsession_|. This
« no previous file with comments | « media/cdm/ppapi/cdm_wrapper.h ('k') | media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698