| Index: media/capture/video/mac/video_capture_device_factory_mac.h
|
| diff --git a/media/capture/video/mac/video_capture_device_factory_mac.h b/media/capture/video/mac/video_capture_device_factory_mac.h
|
| index 3c57efee2d2853669e56145af4364e9aa5f088d2..ccf31ddd2904ed66079e587b74dda8af72685806 100644
|
| --- a/media/capture/video/mac/video_capture_device_factory_mac.h
|
| +++ b/media/capture/video/mac/video_capture_device_factory_mac.h
|
| @@ -19,18 +19,14 @@ class CAPTURE_EXPORT VideoCaptureDeviceFactoryMac
|
| VideoCaptureDeviceFactoryMac();
|
| ~VideoCaptureDeviceFactoryMac() override;
|
|
|
| - std::unique_ptr<VideoCaptureDevice> Create(
|
| - const VideoCaptureDevice::Name& device_name) override;
|
| - void GetDeviceNames(VideoCaptureDevice::Names* device_names) override;
|
| - void EnumerateDeviceNames(
|
| - const base::Callback<
|
| - void(std::unique_ptr<media::VideoCaptureDevice::Names>)>& callback)
|
| - override;
|
| - void GetDeviceSupportedFormats(
|
| - const VideoCaptureDevice::Name& device,
|
| + std::unique_ptr<VideoCaptureDevice> CreateDevice(
|
| + const VideoCaptureDeviceDescriptor& device_descriptor) override;
|
| + void GetDeviceDescriptors(
|
| + VideoCaptureDeviceDescriptors* device_descriptors) override;
|
| + void GetSupportedFormats(
|
| + const VideoCaptureDeviceDescriptor& device_descriptor,
|
| VideoCaptureFormats* supported_formats) override;
|
|
|
| - private:
|
| DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryMac);
|
| };
|
|
|
|
|