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

Unified Diff: media/base/android/video_decoder_job.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/base/android/media_source_player_unittest.cc ('k') | media/base/audio_buffer_converter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/video_decoder_job.h
diff --git a/media/base/android/video_decoder_job.h b/media/base/android/video_decoder_job.h
index ac3dc27b108e997d0c6f909c53554562201c0eb5..ffe0e14352dd08b57c36ba9363284a0a5b6c5da3 100644
--- a/media/base/android/video_decoder_job.h
+++ b/media/base/android/video_decoder_job.h
@@ -32,9 +32,9 @@ class VideoDecoderJob : public MediaDecoderJob {
bool SetVideoSurface(gfx::ScopedJavaSurface surface);
// MediaDecoderJob implementation.
- virtual bool HasStream() const OVERRIDE;
- virtual void Flush() OVERRIDE;
- virtual void ReleaseDecoderResources() OVERRIDE;
+ virtual bool HasStream() const override;
+ virtual void Flush() override;
+ virtual void ReleaseDecoderResources() override;
bool next_video_data_is_iframe() {
return next_video_data_is_iframe_;
@@ -50,15 +50,15 @@ class VideoDecoderJob : public MediaDecoderJob {
size_t size,
bool render_output,
base::TimeDelta current_presentation_timestamp,
- const ReleaseOutputCompletionCallback& callback) OVERRIDE;
- virtual bool ComputeTimeToRender() const OVERRIDE;
- virtual void UpdateDemuxerConfigs(const DemuxerConfigs& configs) OVERRIDE;
+ const ReleaseOutputCompletionCallback& callback) override;
+ virtual bool ComputeTimeToRender() const override;
+ virtual void UpdateDemuxerConfigs(const DemuxerConfigs& configs) override;
virtual bool IsCodecReconfigureNeeded(
- const DemuxerConfigs& configs) const OVERRIDE;
+ const DemuxerConfigs& configs) const override;
virtual bool AreDemuxerConfigsChanged(
- const DemuxerConfigs& configs) const OVERRIDE;
- virtual bool CreateMediaCodecBridgeInternal() OVERRIDE;
- virtual void CurrentDataConsumed(bool is_config_change) OVERRIDE;
+ const DemuxerConfigs& configs) const override;
+ virtual bool CreateMediaCodecBridgeInternal() override;
+ virtual void CurrentDataConsumed(bool is_config_change) override;
// Returns true if a protected surface is required for video playback.
bool IsProtectedSurfaceRequired();
« no previous file with comments | « media/base/android/media_source_player_unittest.cc ('k') | media/base/audio_buffer_converter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698