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

Unified Diff: media/filters/chunk_demuxer.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/filters/blocking_url_protocol.h ('k') | media/filters/clockless_video_frame_scheduler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.h
diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
index 4837dff49fc2e9dc25b08d7b14106fcacf856e69..a617d3d3828f6b61a6b355bee45457772f814333 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -80,12 +80,12 @@ class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream {
void UnmarkEndOfStream();
// DemuxerStream methods.
- virtual void Read(const ReadCB& read_cb) OVERRIDE;
- virtual Type type() OVERRIDE;
- virtual AudioDecoderConfig audio_decoder_config() OVERRIDE;
- virtual VideoDecoderConfig video_decoder_config() OVERRIDE;
- virtual bool SupportsConfigChanges() OVERRIDE;
- virtual VideoRotation video_rotation() OVERRIDE;
+ virtual void Read(const ReadCB& read_cb) override;
+ virtual Type type() override;
+ virtual AudioDecoderConfig audio_decoder_config() override;
+ virtual VideoDecoderConfig video_decoder_config() override;
+ virtual bool SupportsConfigChanges() override;
+ virtual VideoRotation video_rotation() override;
// Returns the text track configuration. It is an error to call this method
// if type() != TEXT.
@@ -159,13 +159,13 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
// Demuxer implementation.
virtual void Initialize(DemuxerHost* host,
const PipelineStatusCB& cb,
- bool enable_text_tracks) OVERRIDE;
- virtual void Stop() OVERRIDE;
- virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE;
- virtual base::Time GetTimelineOffset() const OVERRIDE;
- virtual DemuxerStream* GetStream(DemuxerStream::Type type) OVERRIDE;
- virtual base::TimeDelta GetStartTime() const OVERRIDE;
- virtual Liveness GetLiveness() const OVERRIDE;
+ bool enable_text_tracks) override;
+ virtual void Stop() override;
+ virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) override;
+ virtual base::Time GetTimelineOffset() const override;
+ virtual DemuxerStream* GetStream(DemuxerStream::Type type) override;
+ virtual base::TimeDelta GetStartTime() const override;
+ virtual Liveness GetLiveness() const override;
// Methods used by an external object to control this demuxer.
//
« no previous file with comments | « media/filters/blocking_url_protocol.h ('k') | media/filters/clockless_video_frame_scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698