| Index: media/base/android/media_player_bridge.h
|
| diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h
|
| index 8ee6bd582a7a01d12fa77b466e3b2909e51558c0..ce0dfb22b0ec24f0f0aaf2012e9dc9b0885b24cd 100644
|
| --- a/media/base/android/media_player_bridge.h
|
| +++ b/media/base/android/media_player_bridge.h
|
| @@ -57,24 +57,24 @@ class MEDIA_EXPORT MediaPlayerBridge : public MediaPlayerAndroid {
|
| virtual void Initialize();
|
|
|
| // MediaPlayerAndroid implementation.
|
| - virtual void SetVideoSurface(gfx::ScopedJavaSurface surface) OVERRIDE;
|
| - virtual void Start() OVERRIDE;
|
| - virtual void Pause(bool is_media_related_action ALLOW_UNUSED) 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 GURL GetUrl() OVERRIDE;
|
| - virtual GURL GetFirstPartyForCookies() OVERRIDE;
|
| - virtual bool IsSurfaceInUse() const OVERRIDE;
|
| + virtual void SetVideoSurface(gfx::ScopedJavaSurface surface) override;
|
| + virtual void Start() override;
|
| + virtual void Pause(bool is_media_related_action ALLOW_UNUSED) 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 GURL GetUrl() override;
|
| + virtual GURL GetFirstPartyForCookies() override;
|
| + virtual bool IsSurfaceInUse() const override;
|
|
|
| // MediaPlayerListener callbacks.
|
| void OnVideoSizeChanged(int width, int height);
|
|
|