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

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

Issue 218763007: Update MediaStreamTrack::Stop to latest draft. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments. 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
« no previous file with comments | « no previous file | content/renderer/media/media_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream.h
diff --git a/content/renderer/media/media_stream.h b/content/renderer/media/media_stream.h
index 228104311a700d7f9525b057b5b60e6c24424532..ac7faf43906cc4bf032c75d7cf9488924570fedd 100644
--- a/content/renderer/media/media_stream.h
+++ b/content/renderer/media/media_stream.h
@@ -26,11 +26,8 @@ class MediaStreamDependencyFactory;
class CONTENT_EXPORT MediaStream
: NON_EXPORTED_BASE(public blink::WebMediaStream::ExtraData) {
public:
- typedef base::Callback<void(const std::string& label)> StreamStopCallback;
-
// Constructor for local MediaStreams.
MediaStream(MediaStreamDependencyFactory* factory,
- StreamStopCallback stream_stop,
const blink::WebMediaStream& stream);
// Constructor for remote MediaStreams.
explicit MediaStream(webrtc::MediaStreamInterface* stream);
@@ -51,10 +48,6 @@ class CONTENT_EXPORT MediaStream
// way regardless if they are local or remote.
bool is_local() const { return is_local_; }
- // Called by MediaStreamCenter when a stream has been stopped
- // from JavaScript. Triggers |stream_stop_callback_|.
- void OnStreamStopped();
-
// Called by MediaStreamCenter when a track has been added to a stream stream.
// If a libjingle representation of |stream| exist, the track is added to
// the libjingle MediaStream.
@@ -72,7 +65,6 @@ class CONTENT_EXPORT MediaStream
const blink::WebMediaStream& stream);
private:
- StreamStopCallback stream_stop_callback_;
scoped_refptr<webrtc::MediaStreamInterface> stream_adapter_;
const bool is_local_;
const std::string label_;
« no previous file with comments | « no previous file | content/renderer/media/media_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698