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

Unified Diff: content/browser/renderer_host/media/media_stream_dispatcher_host.cc

Issue 54863002: Implement a salt for MediaSource IDs that can be cleared by a user. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed review comments- unit tests still don't compile Created 7 years, 2 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/browser/renderer_host/media/media_stream_dispatcher_host.cc
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
index f428ee09701e04221b676dbccf83bdc61cb17270..d7981ea8a5191d185af996cf9f12d7f56f0d7fe2 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
@@ -14,8 +14,10 @@ namespace content {
MediaStreamDispatcherHost::MediaStreamDispatcherHost(
int render_process_id,
+ ResourceContext* resource_context,
MediaStreamManager* media_stream_manager)
: render_process_id_(render_process_id),
+ resource_context_(resource_context),
media_stream_manager_(media_stream_manager) {
}
@@ -131,7 +133,8 @@ void MediaStreamDispatcherHost::OnGenerateStream(
<< security_origin.spec() << ")";
const std::string& label = media_stream_manager_->GenerateStream(
- this, render_process_id_, render_view_id, page_request_id,
+ this, render_process_id_, render_view_id, resource_context_,
+ page_request_id,
components, security_origin);
CHECK(!label.empty());
StoreRequest(render_view_id, page_request_id, label);
@@ -176,8 +179,8 @@ void MediaStreamDispatcherHost::OnEnumerateDevices(
<< security_origin.spec() << ")";
const std::string& label = media_stream_manager_->EnumerateDevices(
- this, render_process_id_, render_view_id, page_request_id,
- type, security_origin);
+ this, render_process_id_, render_view_id, resource_context_,
+ page_request_id, type, security_origin);
StoreRequest(render_view_id, page_request_id, label);
}
@@ -206,8 +209,8 @@ void MediaStreamDispatcherHost::OnOpenDevice(
<< security_origin.spec() << ")";
const std::string& label = media_stream_manager_->OpenDevice(
- this, render_process_id_, render_view_id, page_request_id,
- device_id, type, security_origin);
+ this, render_process_id_, render_view_id, resource_context_,
+ page_request_id, device_id, type, security_origin);
StoreRequest(render_view_id, page_request_id, label);
}

Powered by Google App Engine
This is Rietveld 408576698