content/browser/media/capture/web_contents_audio_input_stream.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/media/capture/web_contents_audio_input_stream.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/media/capture/web_contents_audio_input_stream.cc

diff --git a/content/browser/media/capture/web_contents_audio_input_stream.cc b/content/browser/media/capture/web_contents_audio_input_stream.cc

index d78b634e3ea8f5e8ebdf76c4cab69f967af2f755..50051a1a8cb31337770dfead27471ec7316aa74b 100644

--- a/content/browser/media/capture/web_contents_audio_input_stream.cc

+++ b/content/browser/media/capture/web_contents_audio_input_stream.cc

@@ -13,11 +13,11 @@

#include "base/memory/scoped_ptr.h"

#include "base/threading/thread_checker.h"

#include "content/browser/media/capture/audio_mirroring_manager.h"

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

#include "content/browser/media/capture/web_contents_tracker.h"

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

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

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

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

#include "media/audio/virtual_audio_input_stream.h"

#include "media/audio/virtual_audio_output_stream.h"

#include "media/base/bind_to_current_loop.h"

@@ -329,7 +329,7 @@ WebContentsAudioInputStream* WebContentsAudioInputStream::Create(

AudioMirroringManager* audio_mirroring_manager) {

int render_process_id;

int main_render_frame_id;

- if (!WebContentsCaptureUtil::ExtractTabCaptureTarget(

+ if (!WebContentsMediaCaptureId::ExtractTabCaptureTarget(

device_id, &render_process_id, &main_render_frame_id)) {

return NULL;

}