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

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

Issue 10947030: Removed the use of WebFrame::frameForCurrentContext() in MediaStreamCenter::didStopLocalMediaStream (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Addressing code review comments found by Tommi. Created 8 years, 3 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_extra_data.h
diff --git a/content/renderer/media/media_stream_extra_data.h b/content/renderer/media/media_stream_extra_data.h
index c838371fad3b415dcd85aed04d0af9d838fce9eb..a94e730af24e0622549e3e5073e18b31c5298790 100644
--- a/content/renderer/media/media_stream_extra_data.h
+++ b/content/renderer/media/media_stream_extra_data.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_EXTRA_DATA_H_
#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_EXTRA_DATA_H_
+#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
@@ -18,17 +19,24 @@ class LocalMediaStreamInterface;
class CONTENT_EXPORT MediaStreamExtraData
: NON_EXPORTED_BASE(public WebKit::WebMediaStreamDescriptor::ExtraData) {
public:
+ typedef base::Callback<void(const std::string& label)> StreamStopCallback;
+
explicit MediaStreamExtraData(webrtc::MediaStreamInterface* remote_stream);
explicit MediaStreamExtraData(
webrtc::LocalMediaStreamInterface* local_stream);
virtual ~MediaStreamExtraData();
+ void SetLocalStreamStopCallback(
+ const StreamStopCallback& stop_callback);
+ void OnLocalStreamStop();
+
webrtc::MediaStreamInterface* remote_stream() { return remote_stream_.get(); }
webrtc::LocalMediaStreamInterface* local_stream() {
return local_stream_.get();
}
private:
+ StreamStopCallback stream_stop_callback_;
scoped_refptr<webrtc::MediaStreamInterface> remote_stream_;
scoped_refptr<webrtc::LocalMediaStreamInterface> local_stream_;
« no previous file with comments | « content/renderer/media/media_stream_dependency_factory.cc ('k') | content/renderer/media/media_stream_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698