content/browser/renderer_host/media/web_contents_video_capture_device.cc - Issue 11298006: Browser-wide audio mirroring for TabCapture API

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

Issue 11298006: Browser-wide audio mirroring for TabCapture API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Relevant files only. Created 8 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:

View side-by-side diff with in-line comments

Download patch

« content/browser/renderer_host/media/web_contents_capture_util.cc ('K') | « content/browser/renderer_host/media/web_contents_capture_util.cc ('k') | media/audio/audio_input_controller.cc » ('j') | media/audio/audio_manager_base.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 6e69c0f2ae9ac68091a8ca7da960a94a45a12589..3242689da6e207b183cbdb935e4da51fb8c7516f 100644

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

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

@@ -50,6 +50,9 @@

#include "base/debug/trace_event.h"

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

+#include "base/string_number_conversions.h"

+#include "base/string_piece.h"

+#include "base/string_util.h"

#include "base/stringprintf.h"

#include "base/synchronization/lock.h"

#include "base/threading/thread.h"

@@ -61,6 +64,7 @@

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

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

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

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

#include "media/base/bind_to_loop.h"

#include "media/video/capture/video_capture_types.h"

#include "skia/ext/image_operations.h"