Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1248)

Unified Diff: media/capture/video/linux/video_capture_device_chromeos.h

Issue 2936373002: Revert of media: add video capture device for ARC++ camera HAL v3 (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d9e738ed2f2a714b9086f391363a7b3fb8bdaa8b..b3ba70d3982188b6eb5b7b896a1980d1c79461c0 100644
--- a/media/capture/video/linux/video_capture_device_chromeos.h
+++ b/media/capture/video/linux/video_capture_device_chromeos.h
@@ -7,7 +7,6 @@
#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"
@@ -20,8 +19,7 @@
// 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,
- public DisplayRotationObserver {
+class VideoCaptureDeviceChromeOS : public VideoCaptureDeviceLinux {
public:
explicit VideoCaptureDeviceChromeOS(
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
@@ -32,8 +30,9 @@
void SetRotation(int rotation) override;
private:
- // DisplayRotationObserver implementation.
- void SetDisplayRotation(const display::Display& display) override;
+ class ScreenObserverDelegate;
+
+ void SetDisplayRotation(const display::Display& display);
scoped_refptr<ScreenObserverDelegate> screen_observer_delegate_;
const VideoFacingMode lens_facing_;
const int camera_orientation_;

Powered by Google App Engine
This is Rietveld 408576698