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

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

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_dependency_factory.cc
diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc
index 2e48d7d2506f1cdf50a14d076d82ef9c78a58e4c..06319d0ebd77c3c6365875488a250751cdacf0ca 100644
--- a/content/renderer/media/media_stream_dependency_factory.cc
+++ b/content/renderer/media/media_stream_dependency_factory.cc
@@ -8,7 +8,6 @@
#include "base/synchronization/waitable_event.h"
#include "base/utf_string_conversions.h"
-#include "content/renderer/media/media_stream_extra_data.h"
#include "content/renderer/media/media_stream_source_extra_data.h"
#include "content/renderer/media/peer_connection_handler_jsep.h"
#include "content/renderer/media/rtc_peer_connection_handler.h"
@@ -180,6 +179,18 @@ bool MediaStreamDependencyFactory::CreateNativeLocalMediaStream(
return true;
}
+bool MediaStreamDependencyFactory::CreateNativeLocalMediaStream(
+ WebKit::WebMediaStreamDescriptor* description,
+ const MediaStreamExtraData::StreamStopCallback& stream_stop) {
+ if(!CreateNativeLocalMediaStream(description))
+ return false;
+
+ MediaStreamExtraData* extra_data =
+ static_cast<MediaStreamExtraData*>(description->extraData());
+ extra_data->SetLocalStreamStopCallback(stream_stop);
+ return true;
+}
+
bool MediaStreamDependencyFactory::CreatePeerConnectionFactory(
talk_base::Thread* worker_thread,
talk_base::Thread* signaling_thread,
« no previous file with comments | « content/renderer/media/media_stream_dependency_factory.h ('k') | content/renderer/media/media_stream_extra_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698