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

Unified Diff: media/blink/webmediaplayer_params.h

Issue 2389473002: Media Remoting: Add RemotingController. (Closed)
Patch Set: Rebased. Created 4 years, 2 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 | « media/blink/webmediaplayer_impl_unittest.cc ('k') | media/blink/webmediaplayer_params.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediaplayer_params.h
diff --git a/media/blink/webmediaplayer_params.h b/media/blink/webmediaplayer_params.h
index 230e5295294a7a313deebee68dfba0d9e6a0b4de..6e6aa9540fb69a851fabdf267dafcebed85451b9 100644
--- a/media/blink/webmediaplayer_params.h
+++ b/media/blink/webmediaplayer_params.h
@@ -10,6 +10,8 @@
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
+#include "media/base/media_observer.h"
#include "media/blink/media_blink_export.h"
#include "media/filters/context_3d.h"
@@ -55,7 +57,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerParams {
const Context3DCB& context_3d,
const AdjustAllocatedMemoryCB& adjust_allocated_memory_cb,
blink::WebContentDecryptionModule* initial_cdm,
- SurfaceManager* surface_manager);
+ SurfaceManager* surface_manager,
+ base::WeakPtr<MediaObserver> media_observer);
~WebMediaPlayerParams();
@@ -95,6 +98,10 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerParams {
SurfaceManager* surface_manager() const { return surface_manager_; }
+ base::WeakPtr<MediaObserver> media_observer() const {
+ return media_observer_;
+ }
+
private:
DeferLoadCB defer_load_cb_;
scoped_refptr<SwitchableAudioRendererSink> audio_renderer_sink_;
@@ -107,6 +114,7 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerParams {
blink::WebContentDecryptionModule* initial_cdm_;
SurfaceManager* surface_manager_;
+ base::WeakPtr<MediaObserver> media_observer_;
DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams);
};
« no previous file with comments | « media/blink/webmediaplayer_impl_unittest.cc ('k') | media/blink/webmediaplayer_params.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698