summaryrefslogtreecommitdiffstats
path: root/content/renderer/media/mock_media_stream_dispatcher.h
diff options
context:
space:
mode:
authormiu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-11 02:53:08 +0000
committermiu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-11 02:53:08 +0000
commit5f5dd4557415ba70311f639c96886091673effa0 (patch)
tree0a75384dcbe04ac88dd1bcf9df8efeff1f6bfcf3 /content/renderer/media/mock_media_stream_dispatcher.h
parent4bcb13b49b97cbf78667ae5b8272fae38255c520 (diff)
downloadchromium_src-5f5dd4557415ba70311f639c96886091673effa0.zip
chromium_src-5f5dd4557415ba70311f639c96886091673effa0.tar.gz
chromium_src-5f5dd4557415ba70311f639c96886091673effa0.tar.bz2
Begin adding support for tab mirroring via the MediaStream audio/video capturing
framework. Expanded the scope of the content::MediaStreamDeviceType enum to support the new concept of "internal capture devices." From there, many modules were tweaked to account for the new concept. In some cases, significant new functionality was added (described below). In this change, tab mirroring audio and video capture devices have been introduced, but stubbed-out. The following proposal provides more backrgound on this and the overall motivation for the code changes at-hand: http://dev.chromium.org/developers/design-documents/extensions/proposed-changes/apis-under-development/webrtc-tab-content-capture Significant changes: 1. content/common/media and content/public/common -- a) Expand content::MediaStreamDeviceType enum; b) Update media_stream::StreamOptions so that extension API bindings can ask for any of the MediaStreamTypes. 2. content/browser/renderer_host/media -- Minor refactoring: MediaStreamManager handles all MediaStreamDeviceTypes. Only supports EnumerateDevices and OpenDevice for physical device types. Add new GenerateStreamForDevice() API. 3. chrome/browser/media and chrome/browser/ui -- Enhance "Allow/Deny and device selection" infobar to handle all MediaStreamDeviceTypes. Review URL: https://chromiumcodereview.appspot.com/10912004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media/mock_media_stream_dispatcher.h')
-rw-r--r--content/renderer/media/mock_media_stream_dispatcher.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/content/renderer/media/mock_media_stream_dispatcher.h b/content/renderer/media/mock_media_stream_dispatcher.h
index 3deaf97..e3516cb 100644
--- a/content/renderer/media/mock_media_stream_dispatcher.h
+++ b/content/renderer/media/mock_media_stream_dispatcher.h
@@ -21,6 +21,12 @@ class MockMediaStreamDispatcher : public MediaStreamDispatcher {
const base::WeakPtr<MediaStreamDispatcherEventHandler>&,
media_stream::StreamOptions components,
const GURL&) OVERRIDE;
+ virtual void GenerateStreamForDevice(
+ int request_id,
+ const base::WeakPtr<MediaStreamDispatcherEventHandler>&,
+ media_stream::StreamOptions components,
+ const std::string& device_id,
+ const GURL&) OVERRIDE;
virtual void StopStream(const std::string& label) OVERRIDE;
virtual bool IsStream(const std::string& label) OVERRIDE;
virtual int video_session_id(const std::string& label, int index) OVERRIDE;