content/browser/media_devices_monitor.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/media_devices_monitor.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:

Index: content/browser/media_devices_monitor.cc

diff --git a/content/browser/media_devices_monitor.cc b/content/browser/media_devices_monitor.cc

index 72c3b4b1cefcc1b7c9a4180d63abe780212cde5d..43c8fc8374bb57abb882543b9fb95273cb2a8e2c 100644

--- a/content/browser/media_devices_monitor.cc

+++ b/content/browser/media_devices_monitor.cc

@@ -13,7 +13,7 @@ namespace {

void EnsureMonitorCaptureDevicesInternal(

MediaStreamManager* media_stream_manager) {

media_stream_manager->EnumerateDevices(

- NULL, -1, -1, -1, MEDIA_DEVICE_AUDIO_CAPTURE, GURL());

+ NULL, -1, -1, NULL, -1, MEDIA_DEVICE_AUDIO_CAPTURE, GURL());

Jói 2013/10/31 17:19:35 Does this need to be fixed or is NULL OK?

perkj_chrome 2013/11/01 13:39:34 Null is ok. This is an ugly way of starting an enu

}