Index: content/renderer/media/android/webmediaplayer_android.h |
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h |
index 51ba4af1b3cc3fbf820774b6f55e37bba5502a87..fa13ce849ff78207d8eced1de7aeea9ad01161fc 100644 |
--- a/content/renderer/media/android/webmediaplayer_android.h |
+++ b/content/renderer/media/android/webmediaplayer_android.h |
@@ -29,6 +29,7 @@ |
#include "media/base/demuxer_stream.h" |
#include "media/base/media_keys.h" |
#include "media/base/time_delta_interpolator.h" |
+#include "media/blink/webmediaplayer_delegate.h" |
#include "media/blink/webmediaplayer_params.h" |
#include "media/cdm/proxy_decryptor.h" |
#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" |
@@ -66,7 +67,6 @@ class CdmFactory; |
class MediaLog; |
class MediaPermission; |
class WebContentDecryptionModuleImpl; |
-class WebMediaPlayerDelegate; |
} |
namespace content { |
@@ -78,10 +78,12 @@ class RendererMediaPlayerManager; |
// media player in the browser process. It listens to all the status changes |
// sent from the browser process and sends playback controls to the media |
// player. |
-class WebMediaPlayerAndroid : public blink::WebMediaPlayer, |
- public cc::VideoFrameProvider, |
- public RenderFrameObserver, |
- public StreamTextureFactoryContextObserver { |
+class WebMediaPlayerAndroid |
+ : public blink::WebMediaPlayer, |
+ public cc::VideoFrameProvider, |
+ public RenderFrameObserver, |
+ public NON_EXPORTED_BASE(media::WebMediaPlayerDelegate::Observer), |
+ public StreamTextureFactoryContextObserver { |
public: |
// Construct a WebMediaPlayerAndroid object. This class communicates with the |
// MediaPlayerAndroid object in the browser process through |proxy|. |
@@ -269,6 +271,13 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, |
// is not available. |
void OnWaitingForDecryptionKey(); |
+ // WebMediaPlayerDelegate::Observer implementation. |
+ blink::WebMediaPlayer* GetPlayer() override; |
+ void OnHidden() override; |
+ void OnShown() override; |
+ void OnPlay() override; |
+ void OnPause() override; |
+ |
protected: |
// Helper method to update the playing state. |
void UpdatePlayingState(bool is_playing_); |