content/browser/renderer_host/media/media_stream_manager.cc - Issue 1503563004: Desktop chrome tab capture-chooseDesktopMedia()

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

Issue 1503563004: Desktop chrome tab capture-chooseDesktopMedia() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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/renderer_host/media/media_stream_manager.cc

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

index 0d36cd06e12b448b3f6fd72380a80710e0000333..49c828b00ecebe32dbbb583c936f87e3dcc45c8d 100644

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

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

@@ -28,7 +28,6 @@

#include "base/threading/thread_local.h"

#include "build/build_config.h"

#include "content/browser/browser_main_loop.h"

-#include "content/browser/media/capture/web_contents_capture_util.h"

#include "content/browser/renderer_host/media/audio_input_device_manager.h"

#include "content/browser/renderer_host/media/audio_output_device_enumerator.h"

#include "content/browser/renderer_host/media/media_capture_devices_impl.h"

@@ -41,6 +40,7 @@

#include "content/public/browser/media_observer.h"

#include "content/public/browser/media_request_state.h"

#include "content/public/browser/render_process_host.h"

+#include "content/public/browser/web_contents_media_capture_id.h"

#include "content/public/common/content_client.h"

#include "content/public/common/content_switches.h"

#include "content/public/common/media_stream_request.h"

@@ -1269,7 +1269,7 @@ bool MediaStreamManager::SetupTabCaptureRequest(DeviceRequest* request) {

int target_render_process_id = 0;

int target_render_frame_id = 0;

- bool has_valid_device_id = WebContentsCaptureUtil::ExtractTabCaptureTarget(

+ bool has_valid_device_id = WebContentsMediaCaptureId::ExtractTabCaptureTarget(

capture_device_id, &target_render_process_id, &target_render_frame_id);

if (!has_valid_device_id ||

(request->audio_type() != MEDIA_TAB_AUDIO_CAPTURE &&