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

Unified Diff: media/mojo/services/mojo_renderer_impl.h

Issue 616513004: Convert the remaining MOJO_OVERRIDE -> override, and get rid of MOJO_OVERRIDE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | media/mojo/services/mojo_renderer_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_renderer_impl.h
diff --git a/media/mojo/services/mojo_renderer_impl.h b/media/mojo/services/mojo_renderer_impl.h
index 8b56ec3ad5e49c3ec2b982d185a6a0ea25e30960..6e7420b6911d65e9572045611eab6043ad06e567 100644
--- a/media/mojo/services/mojo_renderer_impl.h
+++ b/media/mojo/services/mojo_renderer_impl.h
@@ -47,22 +47,22 @@ class MojoRendererImpl : public Renderer, public mojo::MediaRendererClient {
const StatisticsCB& statistics_cb,
const base::Closure& ended_cb,
const PipelineStatusCB& error_cb,
- const BufferingStateCB& buffering_state_cb) OVERRIDE;
- virtual void Flush(const base::Closure& flush_cb) OVERRIDE;
- virtual void StartPlayingFrom(base::TimeDelta time) OVERRIDE;
- virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
- virtual void SetVolume(float volume) OVERRIDE;
- virtual base::TimeDelta GetMediaTime() OVERRIDE;
- virtual bool HasAudio() OVERRIDE;
- virtual bool HasVideo() OVERRIDE;
- virtual void SetCdm(MediaKeys* cdm) OVERRIDE;
+ const BufferingStateCB& buffering_state_cb) override;
+ virtual void Flush(const base::Closure& flush_cb) override;
+ virtual void StartPlayingFrom(base::TimeDelta time) override;
+ virtual void SetPlaybackRate(float playback_rate) override;
+ virtual void SetVolume(float volume) override;
+ virtual base::TimeDelta GetMediaTime() override;
+ virtual bool HasAudio() override;
+ virtual bool HasVideo() override;
+ virtual void SetCdm(MediaKeys* cdm) override;
// mojo::MediaRendererClient implementation.
virtual void OnTimeUpdate(int64_t time_usec,
- int64_t max_time_usec) MOJO_OVERRIDE;
- virtual void OnBufferingStateChange(mojo::BufferingState state) MOJO_OVERRIDE;
- virtual void OnEnded() MOJO_OVERRIDE;
- virtual void OnError() MOJO_OVERRIDE;
+ int64_t max_time_usec) override;
+ virtual void OnBufferingStateChange(mojo::BufferingState state) override;
+ virtual void OnEnded() override;
+ virtual void OnError() override;
private:
// Called when |remote_audio_renderer_| has finished initializing.
« no previous file with comments | « no previous file | media/mojo/services/mojo_renderer_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698