content/browser/renderer_host/media/video_capture_manager.cc - Issue 1825633002: Adds UMA histograms for desktop tab and audio capture through

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/video_capture_manager.cc

Issue 1825633002: Adds UMA histograms for desktop tab and audio capture through (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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/capture/web_contents_video_capture_device.cc ('K') | « content/browser/renderer_host/media/audio_input_renderer_host.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8e84fdd8441db69efeec858ea857c51bc2490173..de1cc9917f5284f65e4011f96d6ccb88d366e654 100644

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

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

@@ -495,7 +495,8 @@ VideoCaptureManager::DoStartTabCaptureOnDeviceThread(

DCHECK(IsOnDeviceThread());

scoped_ptr<media::VideoCaptureDevice> video_capture_device;

- video_capture_device.reset(WebContentsVideoCaptureDevice::Create(id));

+ video_capture_device.reset(WebContentsVideoCaptureDevice::Create(

+ id, WebContentsVideoCaptureDevice::CHROME_TAB_CAPTURE));

if (!video_capture_device) {

device_client->OnError(FROM_HERE, "Could not create capture device");

@@ -523,7 +524,8 @@ VideoCaptureManager::DoStartDesktopCaptureOnDeviceThread(

}

if (desktop_id.type == DesktopMediaID::TYPE_WEB_CONTENTS) {

- video_capture_device.reset(WebContentsVideoCaptureDevice::Create(id));

+ video_capture_device.reset(WebContentsVideoCaptureDevice::Create(

+ id, WebContentsVideoCaptureDevice::CHROME_CHOOSE_DESKTOP_MEDIA));

} else {

#if defined(USE_AURA)

video_capture_device = DesktopCaptureDeviceAura::Create(desktop_id);