| Index: media/capture/video/video_capture_device_factory.h
|
| diff --git a/media/capture/video/video_capture_device_factory.h b/media/capture/video/video_capture_device_factory.h
|
| index f0b9b09e413cc4ab61d5f3c8eedb79aeffbc3437..e57ffc0f58932cc158c2487ec7ba315dc44a448c 100644
|
| --- a/media/capture/video/video_capture_device_factory.h
|
| +++ b/media/capture/video/video_capture_device_factory.h
|
| @@ -15,7 +15,7 @@ namespace media {
|
| // devices in the different platforms. VCDFs are created by MediaStreamManager
|
| // on IO thread and plugged into VideoCaptureManager, who owns and operates them
|
| // in Device Thread (a.k.a. Audio Thread).
|
| -// Typical operation is to first call EnumerateDeviceDescriptors() to obtain
|
| +// Typical operation is to first call GetDeviceDescriptors() to obtain
|
| // information about available devices. The obtained descriptors can then be
|
| // used to either obtain the supported formats of a device using
|
| // GetSupportedFormats(), or to create an instance of VideoCaptureDevice for
|
| @@ -35,13 +35,6 @@ class CAPTURE_EXPORT VideoCaptureDeviceFactory {
|
| virtual std::unique_ptr<VideoCaptureDevice> CreateDevice(
|
| const VideoCaptureDeviceDescriptor& device_descriptor) = 0;
|
|
|
| - // Asynchronous version of GetDeviceDescriptors calling back to |callback|.
|
| - // TODO(chfremer): Consider removing this if none of the implementations
|
| - // overrides it. See crbug.com/708233.
|
| - virtual void EnumerateDeviceDescriptors(
|
| - const base::Callback<
|
| - void(std::unique_ptr<VideoCaptureDeviceDescriptors>)>& callback);
|
| -
|
| // Obtains the supported formats of a device.
|
| // This method should be called before allocating or starting a device. In
|
| // case format enumeration is not supported, or there was a problem
|
|
|