content/renderer/pepper/pepper_media_device_manager.cc - Issue 48743008: Pepper: specify the security origin when enumerating media devices.

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/renderer/pepper/pepper_media_device_manager.cc

Issue 48743008: Pepper: specify the security origin when enumerating media devices. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 1 month 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/renderer/pepper/pepper_media_device_manager.cc

diff --git a/content/renderer/pepper/pepper_media_device_manager.cc b/content/renderer/pepper/pepper_media_device_manager.cc

index 353181630126c75712fa7858869fd7240341c597..11e45ad6d781da3caefc713374ce14e5f0caaccf 100644

--- a/content/renderer/pepper/pepper_media_device_manager.cc

+++ b/content/renderer/pepper/pepper_media_device_manager.cc

@@ -45,6 +45,7 @@ PepperMediaDeviceManager::~PepperMediaDeviceManager() {

int PepperMediaDeviceManager::EnumerateDevices(

PP_DeviceType_Dev type,

+ const GURL& document_url,

const EnumerateDevicesCallback& callback) {

enumerate_callbacks_[next_id_] = callback;

int request_id = next_id_++;

@@ -53,7 +54,7 @@ int PepperMediaDeviceManager::EnumerateDevices(

GetRenderViewImpl()->media_stream_dispatcher()->EnumerateDevices(

request_id, AsWeakPtr(),

PepperMediaDeviceManager::FromPepperDeviceType(type),

- GURL());

+ document_url.GetOrigin());

#else

base::MessageLoop::current()->PostTask(

FROM_HERE,