| Index: content/renderer/media/media_stream_dispatcher.h
|
| diff --git a/content/renderer/media/media_stream_dispatcher.h b/content/renderer/media/media_stream_dispatcher.h
|
| index a5fbbbd0640a2882cd1f4f0d1ee884a6bdf7437e..3cc993ad9fe249923329e3d351adbc0b7dc95838 100644
|
| --- a/content/renderer/media/media_stream_dispatcher.h
|
| +++ b/content/renderer/media/media_stream_dispatcher.h
|
| @@ -55,18 +55,6 @@ class CONTENT_EXPORT MediaStreamDispatcher
|
| // Stop a started device that has been requested by calling GenerateStream.
|
| virtual void StopStreamDevice(const StreamDeviceInfo& device_info);
|
|
|
| - // Request to enumerate devices.
|
| - virtual void EnumerateDevices(
|
| - int request_id,
|
| - const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
|
| - MediaStreamType type,
|
| - const url::Origin& security_origin);
|
| -
|
| - // Request to stop enumerating devices.
|
| - void StopEnumerateDevices(
|
| - int request_id,
|
| - const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler);
|
| -
|
| // Request to open a device.
|
| void OpenDevice(
|
| int request_id,
|
| @@ -83,17 +71,6 @@ class CONTENT_EXPORT MediaStreamDispatcher
|
| // Close a started device. |label| is provided in OnDeviceOpened.
|
| void CloseDevice(const std::string& label);
|
|
|
| - // Register and unregister event handlers for device-change notifications.
|
| - // It is an error to try to subscribe a handler that is already subscribed or
|
| - // to cancel the subscription of a handler that is not subscribed. Also,
|
| - // each subscribed handler must make sure to invoke
|
| - // CancelDeviceChangeNotifications() before the handler is destroyed.
|
| - void SubscribeToDeviceChangeNotifications(
|
| - const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
|
| - const url::Origin& security_origin);
|
| - void CancelDeviceChangeNotifications(
|
| - const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler);
|
| -
|
| // Check if the label is a valid stream.
|
| virtual bool IsStream(const std::string& label);
|
| // Get the video session_id given a label. The label identifies a stream.
|
| @@ -104,9 +81,6 @@ class CONTENT_EXPORT MediaStreamDispatcher
|
|
|
| protected:
|
| int GetNextIpcIdForTest() { return next_ipc_id_; }
|
| - size_t NumDeviceChangeSubscribers() const {
|
| - return device_change_subscribers_.size();
|
| - }
|
|
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(MediaStreamDispatcherTest, BasicVideoDevice);
|
| @@ -135,15 +109,11 @@ class CONTENT_EXPORT MediaStreamDispatcher
|
| content::MediaStreamRequestResult result);
|
| void OnDeviceStopped(const std::string& label,
|
| const StreamDeviceInfo& device_info);
|
| - void OnDevicesEnumerated(
|
| - int request_id,
|
| - const StreamDeviceInfoArray& device_array);
|
| void OnDeviceOpened(
|
| int request_id,
|
| const std::string& label,
|
| const StreamDeviceInfo& device_info);
|
| void OnDeviceOpenFailed(int request_id);
|
| - void OnDevicesChanged();
|
|
|
| // Used for DCHECKs so methods calls won't execute in the wrong thread.
|
| base::ThreadChecker thread_checker_;
|
| @@ -157,9 +127,6 @@ class CONTENT_EXPORT MediaStreamDispatcher
|
| typedef std::list<Request> RequestList;
|
| RequestList requests_;
|
|
|
| - std::vector<base::WeakPtr<MediaStreamDispatcherEventHandler>>
|
| - device_change_subscribers_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcher);
|
| };
|
|
|
|
|