| Index: media/base/android/media_source_player.h
|
| diff --git a/media/base/android/media_source_player.h b/media/base/android/media_source_player.h
|
| index 5ef684ea9346103c3e943182506d272f31194760..874e61add84c22ed95a1da86f47843da73991716 100644
|
| --- a/media/base/android/media_source_player.h
|
| +++ b/media/base/android/media_source_player.h
|
| @@ -43,32 +43,31 @@ class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid,
|
| const RequestMediaResourcesCB& request_media_resources_cb,
|
| scoped_ptr<DemuxerAndroid> demuxer,
|
| const GURL& frame_url);
|
| - virtual ~MediaSourcePlayer();
|
| + ~MediaSourcePlayer() override;
|
|
|
| // MediaPlayerAndroid implementation.
|
| - virtual void SetVideoSurface(gfx::ScopedJavaSurface surface) override;
|
| - virtual void Start() override;
|
| - virtual void Pause(bool is_media_related_action) override;
|
| - virtual void SeekTo(base::TimeDelta timestamp) override;
|
| - virtual void Release() override;
|
| - virtual void SetVolume(double volume) override;
|
| - virtual int GetVideoWidth() override;
|
| - virtual int GetVideoHeight() override;
|
| - virtual base::TimeDelta GetCurrentTime() override;
|
| - virtual base::TimeDelta GetDuration() override;
|
| - virtual bool IsPlaying() override;
|
| - virtual bool CanPause() override;
|
| - virtual bool CanSeekForward() override;
|
| - virtual bool CanSeekBackward() override;
|
| - virtual bool IsPlayerReady() override;
|
| - virtual void SetCdm(BrowserCdm* cdm) override;
|
| + void SetVideoSurface(gfx::ScopedJavaSurface surface) override;
|
| + void Start() override;
|
| + void Pause(bool is_media_related_action) override;
|
| + void SeekTo(base::TimeDelta timestamp) override;
|
| + void Release() override;
|
| + void SetVolume(double volume) override;
|
| + int GetVideoWidth() override;
|
| + int GetVideoHeight() override;
|
| + base::TimeDelta GetCurrentTime() override;
|
| + base::TimeDelta GetDuration() override;
|
| + bool IsPlaying() override;
|
| + bool CanPause() override;
|
| + bool CanSeekForward() override;
|
| + bool CanSeekBackward() override;
|
| + bool IsPlayerReady() override;
|
| + void SetCdm(BrowserCdm* cdm) override;
|
|
|
| // DemuxerAndroidClient implementation.
|
| - virtual void OnDemuxerConfigsAvailable(const DemuxerConfigs& params) override;
|
| - virtual void OnDemuxerDataAvailable(const DemuxerData& params) override;
|
| - virtual void OnDemuxerSeekDone(
|
| - base::TimeDelta actual_browser_seek_time) override;
|
| - virtual void OnDemuxerDurationChanged(base::TimeDelta duration) override;
|
| + void OnDemuxerConfigsAvailable(const DemuxerConfigs& params) override;
|
| + void OnDemuxerDataAvailable(const DemuxerData& params) override;
|
| + void OnDemuxerSeekDone(base::TimeDelta actual_browser_seek_time) override;
|
| + void OnDemuxerDurationChanged(base::TimeDelta duration) override;
|
|
|
| private:
|
| friend class MediaSourcePlayerTest;
|
|
|