| 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..d66a30790de946a06fa1c1ec4e72f9689dcb9a06 100644
|
| --- a/media/capture/video/mac/video_capture_device_factory_mac.h
|
| +++ b/media/capture/video/mac/video_capture_device_factory_mac.h
|
| @@ -20,17 +20,17 @@ class CAPTURE_EXPORT 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,
|
| - VideoCaptureFormats* supported_formats) override;
|
| + const VideoCaptureDeviceDescriptor& device_descriptor) override;
|
| + void GetDeviceDescriptors(
|
| + VideoCaptureDeviceDescriptors* device_descriptors) override;
|
| + void GetDeviceInfo(const VideoCaptureDeviceDescriptor& device_descriptor,
|
| + VideoCaptureDeviceInfo* device_info) override;
|
|
|
| private:
|
| + void GetDeviceSupportedFormats(
|
| + const VideoCaptureDeviceDescriptor& device_descriptor,
|
| + VideoCaptureFormats* supported_formats);
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryMac);
|
| };
|
|
|
|
|