content/renderer/pepper/pepper_media_device_manager.cc - Issue 1928493002: Use url::Origin to represent security origins in MediaStream-related code.

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 1928493002: Use url::Origin to represent security origins in MediaStream-related code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 8 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

« no previous file with comments | « content/renderer/media/user_media_client_impl.cc ('k') | extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 e4dd1f6a4da1471d128939fccfc54a5e0ee19091..0b04f28a6eb37ff324d3d60137000b10f9960a0e 100644

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

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

@@ -57,10 +57,9 @@ int PepperMediaDeviceManager::EnumerateDevices(

#if defined(ENABLE_WEBRTC)

GetMediaStreamDispatcher()->EnumerateDevices(

- request_id,

- AsWeakPtr(),

+ request_id, AsWeakPtr(),

PepperMediaDeviceManager::FromPepperDeviceType(type),

- document_url.GetOrigin());

+ url::Origin(document_url.GetOrigin()));

#else

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

FROM_HERE,

@@ -106,11 +105,9 @@ int PepperMediaDeviceManager::OpenDevice(PP_DeviceType_Dev type,