| Index: services/video_capture/device_factory_media_to_mojo_adapter.h
|
| diff --git a/services/video_capture/device_factory_media_to_mojo_adapter.h b/services/video_capture/device_factory_media_to_mojo_adapter.h
|
| index f4fc0da8407b007b5e620b404d508159ba1948ff..bdfb6cab38772112a41cc58e139d867f75c517df 100644
|
| --- a/services/video_capture/device_factory_media_to_mojo_adapter.h
|
| +++ b/services/video_capture/device_factory_media_to_mojo_adapter.h
|
| @@ -34,12 +34,11 @@ class DeviceFactoryMediaToMojoAdapter
|
| void EnumerateDeviceDescriptors(
|
| const EnumerateDeviceDescriptorsCallback& callback) override;
|
| void GetSupportedFormats(
|
| - const media::VideoCaptureDeviceDescriptor& device_descriptor,
|
| + const std::string& device_id,
|
| const GetSupportedFormatsCallback& callback) override;
|
| - void CreateDeviceProxy(
|
| - const media::VideoCaptureDeviceDescriptor& device_descriptor,
|
| - mojom::VideoCaptureDeviceProxyRequest proxy_request,
|
| - const CreateDeviceProxyCallback& callback) override;
|
| + void CreateDeviceProxy(const std::string& device_id,
|
| + mojom::VideoCaptureDeviceProxyRequest proxy_request,
|
| + const CreateDeviceProxyCallback& callback) override;
|
|
|
| private:
|
| struct ActiveDeviceEntry {
|
| @@ -55,13 +54,11 @@ class DeviceFactoryMediaToMojoAdapter
|
| std::unique_ptr<mojo::Binding<mojom::VideoCaptureDeviceProxy>> binding;
|
| };
|
|
|
| - void OnClientConnectionErrorOrClose(
|
| - const media::VideoCaptureDeviceDescriptor& descriptor);
|
| + void OnClientConnectionErrorOrClose(const std::string& device_id);
|
|
|
| const std::unique_ptr<media::VideoCaptureDeviceFactory> device_factory_;
|
| const media::VideoCaptureJpegDecoderFactoryCB jpeg_decoder_factory_callback_;
|
| - std::map<media::VideoCaptureDeviceDescriptor, ActiveDeviceEntry>
|
| - active_devices_;
|
| + std::map<std::string, ActiveDeviceEntry> active_devices_by_id_;
|
| };
|
|
|
| } // namespace video_capture
|
|
|