| Index: media/video/capture/video_capture_device.cc
|
| diff --git a/media/video/capture/video_capture_device.cc b/media/video/capture/video_capture_device.cc
|
| index 2efff7de02c1860e41ccfe49c96b180ca058ba9b..0ff644027b3fc21176869fec00cd48c8528c904d 100644
|
| --- a/media/video/capture/video_capture_device.cc
|
| +++ b/media/video/capture/video_capture_device.cc
|
| @@ -19,6 +19,31 @@ const std::string VideoCaptureDevice::Name::GetNameAndModel() const {
|
| return device_name_ + suffix;
|
| }
|
|
|
| +VideoCaptureDevice::Name::Name() {}
|
| +
|
| +VideoCaptureDevice::Name::Name(const std::string& name, const std::string& id)
|
| + : device_name_(name), unique_id_(id) {}
|
| +
|
| +#if defined(OS_WIN) || defined(OS_MACOSX)
|
| +VideoCaptureDevice::Name::Name(const std::string& name,
|
| + const std::string& id,
|
| + const CaptureApiType api_type)
|
| + : device_name_(name), unique_id_(id), capture_api_class_(api_type) {}
|
| +#endif
|
| +
|
| +#if defined(OS_MACOSX)
|
| +VideoCaptureDevice::Name::Name(const std::string& name,
|
| + const std::string& id,
|
| + const CaptureApiType api_type,
|
| + const TransportType transport_type)
|
| + : device_name_(name),
|
| + unique_id_(id),
|
| + capture_api_class_(api_type),
|
| + transport_class_(transport_type) {}
|
| +#endif
|
| +
|
| +VideoCaptureDevice::Name::~Name() {}
|
| +
|
| VideoCaptureDevice::~VideoCaptureDevice() {}
|
|
|
| int VideoCaptureDevice::GetPowerLineFrequencyForLocation() const {
|
|
|