| Index: media/capture/video/linux/video_capture_device_chromeos.h
|
| diff --git a/media/capture/video/linux/video_capture_device_chromeos.h b/media/capture/video/linux/video_capture_device_chromeos.h
|
| index b3ba70d3982188b6eb5b7b896a1980d1c79461c0..d9e738ed2f2a714b9086f391363a7b3fb8bdaa8b 100644
|
| --- a/media/capture/video/linux/video_capture_device_chromeos.h
|
| +++ b/media/capture/video/linux/video_capture_device_chromeos.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/single_thread_task_runner.h"
|
| +#include "media/capture/video/chromeos/display_rotation_observer.h"
|
| #include "media/capture/video/linux/camera_config_chromeos.h"
|
| #include "media/capture/video/linux/video_capture_device_linux.h"
|
|
|
| @@ -19,7 +20,8 @@ namespace media {
|
| // This class is functionally the same as VideoCaptureDeviceLinux, with the
|
| // exception that it is aware of the orientation of the internal Display. When
|
| // the internal Display is rotated, the frames captured are rotated to match.
|
| -class VideoCaptureDeviceChromeOS : public VideoCaptureDeviceLinux {
|
| +class VideoCaptureDeviceChromeOS : public VideoCaptureDeviceLinux,
|
| + public DisplayRotationObserver {
|
| public:
|
| explicit VideoCaptureDeviceChromeOS(
|
| scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
|
| @@ -30,9 +32,8 @@ class VideoCaptureDeviceChromeOS : public VideoCaptureDeviceLinux {
|
| void SetRotation(int rotation) override;
|
|
|
| private:
|
| - class ScreenObserverDelegate;
|
| -
|
| - void SetDisplayRotation(const display::Display& display);
|
| + // DisplayRotationObserver implementation.
|
| + void SetDisplayRotation(const display::Display& display) override;
|
| scoped_refptr<ScreenObserverDelegate> screen_observer_delegate_;
|
| const VideoFacingMode lens_facing_;
|
| const int camera_orientation_;
|
|
|