Chromium Code Reviews| Index: media/capture/video/linux/video_capture_device_linux.h |
| diff --git a/media/capture/video/linux/video_capture_device_linux.h b/media/capture/video/linux/video_capture_device_linux.h |
| index e8adbde8df41715bdd075c0c921c3f6446eb4383..411d37e6caef95d72482b4fb31d8e3da478018f2 100644 |
| --- a/media/capture/video/linux/video_capture_device_linux.h |
| +++ b/media/capture/video/linux/video_capture_device_linux.h |
| @@ -18,6 +18,7 @@ |
| #include "base/files/scoped_file.h" |
| #include "base/macros.h" |
| #include "base/threading/thread.h" |
| +#include "media/capture/video/linux/camera_characteristics.h" |
|
mcasas
2016/11/29 19:12:56
Not needed: move to video_capture_device_chromeos.
shenghao
2016/12/01 07:34:21
Done.
|
| #include "media/capture/video/video_capture_device.h" |
| #include "media/capture/video_capture_types.h" |
| @@ -45,7 +46,9 @@ class VideoCaptureDeviceLinux : public VideoCaptureDevice { |
| SetPhotoOptionsCallback callback) override; |
| protected: |
| - void SetRotation(int rotation); |
| + virtual void SetRotation(int rotation); |
| + |
| + const VideoCaptureDeviceDescriptor device_descriptor_; |
| private: |
| static int TranslatePowerLineFrequencyToV4L2(PowerLineFrequency frequency); |
| @@ -57,8 +60,6 @@ class VideoCaptureDeviceLinux : public VideoCaptureDevice { |
| base::Thread v4l2_thread_; // Thread used for reading data from the device. |
| - const VideoCaptureDeviceDescriptor device_descriptor_; |
| - |
| DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceLinux); |
| }; |