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

Unified Diff: content/renderer/media/media_stream.cc

Issue 218763007: Update MediaStreamTrack::Stop to latest draft. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make sure audio source stop is triggered if initialization fail. Created 6 years, 8 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
Index: content/renderer/media/media_stream.cc
diff --git a/content/renderer/media/media_stream.cc b/content/renderer/media/media_stream.cc
index 9a8f143211541224ea404d6163506dbf168a2103..bb8a9530814a1eb6e18ba2f52ed68f50f39a426e 100644
--- a/content/renderer/media/media_stream.cc
+++ b/content/renderer/media/media_stream.cc
@@ -26,10 +26,8 @@ webrtc::MediaStreamInterface* MediaStream::GetAdapter(
}
MediaStream::MediaStream(MediaStreamDependencyFactory* factory,
- StreamStopCallback stream_stop,
const blink::WebMediaStream& stream)
- : stream_stop_callback_(stream_stop),
- stream_adapter_(NULL),
+ : stream_adapter_(NULL),
is_local_(true),
label_(stream.id().utf8()),
factory_(factory) {
@@ -46,11 +44,6 @@ MediaStream::MediaStream(webrtc::MediaStreamInterface* stream)
MediaStream::~MediaStream() {
}
-void MediaStream::OnStreamStopped() {
- if (!stream_stop_callback_.is_null())
- stream_stop_callback_.Run(label_);
-}
-
webrtc::MediaStreamInterface* MediaStream::GetWebRtcAdapter(
const blink::WebMediaStream& stream) {
if (!stream_adapter_) {

Powered by Google App Engine
This is Rietveld 408576698