content/browser/renderer_host/media/device_request_message_filter.cc - Issue 54863002: Implement a salt for MediaSource IDs that can be cleared by a user.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/media/device_request_message_filter.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

« content/browser/media_devices_monitor.cc ('K') | « content/browser/media_devices_monitor.cc ('k') | content/browser/renderer_host/media/media_stream_dispatcher_host.h » ('j') | content/browser/renderer_host/media/media_stream_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/device_request_message_filter.cc

diff --git a/content/browser/renderer_host/media/device_request_message_filter.cc b/content/browser/renderer_host/media/device_request_message_filter.cc

index 60729cae4c984fd450a103b5e434fc0a9f48718c..b5bdcb5a2f25fc950303831f956021a98a448843 100644

--- a/content/browser/renderer_host/media/device_request_message_filter.cc

+++ b/content/browser/renderer_host/media/device_request_message_filter.cc

@@ -153,12 +153,14 @@ void DeviceRequestMessageFilter::OnGetSources(int request_id,

const GURL& security_origin) {

// Make request to get audio devices.

const std::string& audio_label = media_stream_manager_->EnumerateDevices(

- this, -1, -1, -1, MEDIA_DEVICE_AUDIO_CAPTURE, security_origin);

+ this, -1, -1, resource_context_, -1, MEDIA_DEVICE_AUDIO_CAPTURE,

+ security_origin);

DCHECK(!audio_label.empty());

// Make request for video devices.

const std::string& video_label = media_stream_manager_->EnumerateDevices(

- this, -1, -1, -1, MEDIA_DEVICE_VIDEO_CAPTURE, security_origin);

+ this, -1, -1, resource_context_, -1, MEDIA_DEVICE_VIDEO_CAPTURE,

+ security_origin);

DCHECK(!video_label.empty());

requests_.push_back(DeviceRequest(