Index: content/browser/renderer_host/media/media_stream_manager.h |
=================================================================== |
--- content/browser/renderer_host/media/media_stream_manager.h (revision 111389) |
+++ content/browser/renderer_host/media/media_stream_manager.h (working copy) |
@@ -68,6 +68,25 @@ |
// Closes generated stream. |
void StopGeneratedStream(const std::string& label); |
+ // Gets a list of video devices. |
+ // The request is identified using |label|, which is pointing to an already |
+ // created std::string. |
+ void EnumerateVideoDevices(MediaStreamRequester* requester, |
+ int render_process_id, |
+ int render_view_id, |
+ const std::string& security_origin, |
+ std::string* label); |
+ |
+ // Open a video device identified by |device_id|. |
+ // The request is identified using |label|, which is pointing to an already |
+ // created std::string. |
+ void OpenVideoDevice(MediaStreamRequester* requester, |
+ int render_process_id, |
+ int render_view_id, |
+ const std::string& device_id, |
+ const std::string& security_origin, |
+ std::string* label); |
+ |
// Implements MediaStreamProviderListener. |
virtual void Opened(MediaStreamType stream_type, |
int capture_session_id) OVERRIDE; |
@@ -80,8 +99,6 @@ |
MediaStreamProviderError error) OVERRIDE; |
// Implements SettingsRequester. |
- virtual void GetDevices(const std::string& label, |
- MediaStreamType stream_type) OVERRIDE; |
virtual void DevicesAccepted(const std::string& label, |
const StreamDeviceInfoArray& devices) OVERRIDE; |
virtual void SettingsError(const std::string& label) OVERRIDE; |
@@ -97,6 +114,11 @@ |
// Helpers. |
bool RequestDone(const MediaStreamManager::DeviceRequest& request) const; |
MediaStreamProvider* GetDeviceManager(MediaStreamType stream_type); |
+ void StartEnumeration(DeviceRequest* new_request, |
+ int render_process_id, |
+ int render_view_id, |
+ const std::string& security_origin, |
+ std::string* label); |
scoped_ptr<MediaStreamDeviceSettings> device_settings_; |
scoped_ptr<VideoCaptureManager> video_capture_manager_; |