Index: content/renderer/media/renderer_webmediaplayer_delegate.h |
diff --git a/content/renderer/media/renderer_webmediaplayer_delegate.h b/content/renderer/media/renderer_webmediaplayer_delegate.h |
index 3b1e3560e5d0995aa846cfa99daf8a17da11a32c..1a707b0205e5eeea33b1a00f18a5c82c3c4c8b48 100644 |
--- a/content/renderer/media/renderer_webmediaplayer_delegate.h |
+++ b/content/renderer/media/renderer_webmediaplayer_delegate.h |
@@ -5,6 +5,8 @@ |
#ifndef CONTENT_RENDERER_MEDIA_RENDERER_WEBMEDIAPLAYER_DELEGATE_H_ |
#define CONTENT_RENDERER_MEDIA_RENDERER_WEBMEDIAPLAYER_DELEGATE_H_ |
+#include <set> |
mlamouri (slow - plz ping)
2016/01/19 16:59:11
nit: remains from old code?
DaleCurtis
2016/01/20 00:43:58
Done.
|
+ |
#include "base/macros.h" |
#include "base/memory/weak_ptr.h" |
#include "base/observer_list.h" |
@@ -27,22 +29,33 @@ class RendererWebMediaPlayerDelegate |
explicit RendererWebMediaPlayerDelegate(content::RenderFrame* render_frame); |
~RendererWebMediaPlayerDelegate() override; |
+ // Returns the player id for a given observer. |
+ // TODO(dalecurtis): Remove once RendererWebMediaPlayerManager is removed. |
+ static int64_t GetPlayerId(Observer* observer); |
+ |
// Returns true if this RenderFrame has ever seen media playback before. |
bool has_played_media() const { return has_played_media_; } |
// WebMediaPlayerDelegate implementation. |
- void DidPlay(blink::WebMediaPlayer* player) override; |
- void DidPause(blink::WebMediaPlayer* player) override; |
- void PlayerGone(blink::WebMediaPlayer* player) override; |
void AddObserver(Observer* observer) override; |
- void RemoveObserver(Observer* observer) override; |
+ void DidPlay(Observer* observer, |
+ bool has_video, |
+ bool has_audio, |
+ bool is_remote, |
+ base::TimeDelta duration) override; |
+ void DidPause(Observer* observer, bool reached_end_of_stream) override; |
+ void PlayerGone(Observer* observer) override; |
bool IsHidden() override; |
// content::RenderFrameObserver overrides. |
void WasHidden() override; |
void WasShown() override; |
+ bool OnMessageReceived(const IPC::Message& msg) override; |
private: |
+ void OnMediaDelegatePause(int64_t player_cookie); |
+ void OnMediaDelegatePlay(int64_t player_cookie); |
+ |
bool has_played_media_ = false; |
base::ObserverList<Observer> observer_list_; |