| Index: content/public/common/media_stream_request.h
|
| diff --git a/content/public/common/media_stream_request.h b/content/public/common/media_stream_request.h
|
| index 7a580619d046bd8ed5c6fb134e13739b83a9ff5b..37172c0261f2da55a3a2cab47e60cfac3450ecdf 100644
|
| --- a/content/public/common/media_stream_request.h
|
| +++ b/content/public/common/media_stream_request.h
|
| @@ -46,7 +46,7 @@ enum MediaStreamRequestType {
|
| MEDIA_DEVICE_ACCESS = 0,
|
| MEDIA_GENERATE_STREAM,
|
| MEDIA_ENUMERATE_DEVICES,
|
| - MEDIA_OPEN_DEVICE
|
| + MEDIA_OPEN_DEVICE // Only used in requests made by Pepper.
|
| };
|
|
|
| // Facing mode for video capture.
|
| @@ -164,7 +164,16 @@ struct CONTENT_EXPORT MediaStreamDevice {
|
| AudioDeviceParameters matched_output;
|
| };
|
|
|
| -typedef std::vector<MediaStreamDevice> MediaStreamDevices;
|
| +class CONTENT_EXPORT MediaStreamDevices
|
| + : public std::vector<MediaStreamDevice> {
|
| + public:
|
| + MediaStreamDevices();
|
| + MediaStreamDevices(size_t count, const MediaStreamDevice& value);
|
| +
|
| + // Looks for a MediaStreamDevice based on its ID.
|
| + // Returns NULL if not found.
|
| + const MediaStreamDevice* FindById(const std::string& device_id) const;
|
| +};
|
|
|
| typedef std::map<MediaStreamType, MediaStreamDevices> MediaStreamDeviceMap;
|
|
|
|
|