Chromium Code Reviews| Index: content/browser/renderer_host/media/video_capture_manager.h |
| diff --git a/content/browser/renderer_host/media/video_capture_manager.h b/content/browser/renderer_host/media/video_capture_manager.h |
| index 74b4d30e9d87f5388d034406654c5b92f159af24..46952d0998005cedad7fea0a7ac7c7f61f89e461 100644 |
| --- a/content/browser/renderer_host/media/video_capture_manager.h |
| +++ b/content/browser/renderer_host/media/video_capture_manager.h |
| @@ -27,6 +27,7 @@ |
| #include "content/common/media/media_stream_options.h" |
| #include "media/video/capture/video_capture_device.h" |
| #include "media/video/capture/video_capture_device_factory.h" |
| +#include "media/video/capture/video_capture_device_info.h" |
| #include "media/video/capture/video_capture_types.h" |
| namespace content { |
| @@ -133,19 +134,8 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider { |
| private: |
| virtual ~VideoCaptureManager(); |
| struct DeviceEntry; |
| - |
| - // This data structure is a convenient wrap of a devices' name and associated |
| - // video capture supported formats. |
| - struct DeviceInfo { |
| - DeviceInfo(); |
| - DeviceInfo(const media::VideoCaptureDevice::Name& name, |
| - const media::VideoCaptureFormats& supported_formats); |
| - ~DeviceInfo(); |
| - |
| - media::VideoCaptureDevice::Name name; |
| - media::VideoCaptureFormats supported_formats; |
| - }; |
| - typedef std::vector<DeviceInfo> DeviceInfos; |
| + typedef media::VideoCaptureDeviceInfo DeviceInfo; |
|
perkj_chrome
2014/10/08 14:26:36
Please rename all DeviceInfo to VideoCaptureDevice
mcasas
2014/10/08 14:49:39
Done.
|
| + typedef media::VideoCaptureDeviceInfos DeviceInfos; |
| // Checks to see if |entry| has no clients left on its controller. If so, |
| // remove it from the list of devices, and delete it asynchronously. |entry| |