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

Unified Diff: media/filters/decrypting_demuxer_stream.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/filters/decrypting_audio_decoder.h ('k') | media/filters/decrypting_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decrypting_demuxer_stream.h
diff --git a/media/filters/decrypting_demuxer_stream.h b/media/filters/decrypting_demuxer_stream.h
index bad4fad06f8320bf91925ab6eee8ed98b38ed244..09bf97aaf3618c2a0c053c543535c1c050e423e9 100644
--- a/media/filters/decrypting_demuxer_stream.h
+++ b/media/filters/decrypting_demuxer_stream.h
@@ -33,7 +33,7 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
const SetDecryptorReadyCB& set_decryptor_ready_cb);
// Cancels all pending operations immediately and fires all pending callbacks.
- virtual ~DecryptingDemuxerStream();
+ ~DecryptingDemuxerStream() override;
void Initialize(DemuxerStream* stream,
const PipelineStatusCB& status_cb);
@@ -45,13 +45,13 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
void Reset(const base::Closure& closure);
// DemuxerStream implementation.
- virtual void Read(const ReadCB& read_cb) override;
- virtual AudioDecoderConfig audio_decoder_config() override;
- virtual VideoDecoderConfig video_decoder_config() override;
- virtual Type type() override;
- virtual void EnableBitstreamConverter() override;
- virtual bool SupportsConfigChanges() override;
- virtual VideoRotation video_rotation() override;
+ void Read(const ReadCB& read_cb) override;
+ AudioDecoderConfig audio_decoder_config() override;
+ VideoDecoderConfig video_decoder_config() override;
+ Type type() override;
+ void EnableBitstreamConverter() override;
+ bool SupportsConfigChanges() override;
+ VideoRotation video_rotation() override;
private:
// For a detailed state diagram please see this link: http://goo.gl/8jAok
« no previous file with comments | « media/filters/decrypting_audio_decoder.h ('k') | media/filters/decrypting_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698