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

Unified Diff: content/renderer/media/media_stream_impl.h

Issue 9309078: Adding a skeleton MediaStreamCenter. (Closed)
Patch Set: Review comments attended Created 8 years, 11 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 | « content/renderer/media/media_stream_center.cc ('k') | content/renderer/media/media_stream_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_impl.h
diff --git a/content/renderer/media/media_stream_impl.h b/content/renderer/media/media_stream_impl.h
index 503c510b12659c43c84580402d10476ea3f617fb..67ddb8b945cb603c3405b651011c59b94b46b287 100644
--- a/content/renderer/media/media_stream_impl.h
+++ b/content/renderer/media/media_stream_impl.h
@@ -41,10 +41,13 @@ class Thread;
}
namespace WebKit {
+class WebMediaStreamCenter;
+class WebMediaStreamCenterClient;
class WebPeerConnectionHandler;
class WebPeerConnectionHandlerClient;
}
+class MediaStreamCenter;
class MediaStreamDispatcher;
class MediaStreamDependencyFactory;
class PeerConnectionHandler;
@@ -72,6 +75,8 @@ class CONTENT_EXPORT MediaStreamImpl
virtual WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler(
WebKit::WebPeerConnectionHandlerClient* client);
+ virtual WebKit::WebMediaStreamCenter* CreateMediaStreamCenter(
+ WebKit::WebMediaStreamCenterClient* client);
virtual void ClosePeerConnection();
virtual webrtc::MediaStreamTrackInterface* GetLocalMediaStreamTrack(
const std::string& label);
@@ -158,6 +163,9 @@ class CONTENT_EXPORT MediaStreamImpl
// TODO(grunell): Support several PeerConnectionsHandlers.
PeerConnectionHandler* peer_connection_handler_;
+ // media_stream_center_ is a weak reference, owned by WebKit.
Henrik Grunell 2012/02/06 20:00:38 Add a comment about the lifetime of |media_stream_
tommyw 2012/02/07 09:26:25 Done.
+ MediaStreamCenter* media_stream_center_;
+
// We keep a list of the generated local tracks, so that we can add capture
// devices when generated and also use them for recording.
typedef talk_base::scoped_refptr<webrtc::MediaStreamTrackInterface>
« no previous file with comments | « content/renderer/media/media_stream_center.cc ('k') | content/renderer/media/media_stream_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698