Chromium Code Reviews| 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..75132a038a5f92bcdda9cc86823e59acef857225 100644 |
| --- a/media/video/capture/video_capture_device.cc |
| +++ b/media/video/capture/video_capture_device.cc |
| @@ -19,6 +19,38 @@ 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) |
| +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) |
| + : device_name_(name), |
| + unique_id_(id), |
| + capture_api_class_(api_type), |
| + transport_type_(OTHER_TRANSPORT) {} |
| +VideoCaptureDevice::Name::Name(const std::string& name, |
|
tommi (sloooow) - chröme
2014/07/03 10:28:36
empty line above this one
mcasas
2014/07/03 16:18:36
Done.
|
| + const std::string& id, |
| + const CaptureApiType api_type, |
| + const TransportType transport_type) |
| + : device_name_(name), |
| + unique_id_(id), |
| + capture_api_class_(api_type), |
| + transport_type_(transport_type) {} |
| +#endif |
| + |
| +VideoCaptureDevice::Name::~Name() {} |
| + |
| VideoCaptureDevice::~VideoCaptureDevice() {} |
| int VideoCaptureDevice::GetPowerLineFrequencyForLocation() const { |