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

Unified Diff: device/capture/video/fake_video_capture_device.h

Issue 2214533002: move //media/capture to //device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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: device/capture/video/fake_video_capture_device.h
diff --git a/media/capture/video/fake_video_capture_device.h b/device/capture/video/fake_video_capture_device.h
similarity index 88%
rename from media/capture/video/fake_video_capture_device.h
rename to device/capture/video/fake_video_capture_device.h
index 9e7cb4112e2d8a47ce2aa3151ee52147b8da386a..00e27c46787a426aa428e79ff936cb61533bea33 100644
--- a/media/capture/video/fake_video_capture_device.h
+++ b/device/capture/video/fake_video_capture_device.h
@@ -5,8 +5,8 @@
// Implementation of a fake VideoCaptureDevice class. Used for testing other
// video capture classes when no real hardware is available.
-#ifndef MEDIA_CAPTURE_VIDEO_FAKE_VIDEO_CAPTURE_DEVICE_H_
-#define MEDIA_CAPTURE_VIDEO_FAKE_VIDEO_CAPTURE_DEVICE_H_
+#ifndef DEVICE_CAPTURE_VIDEO_FAKE_VIDEO_CAPTURE_DEVICE_H_
+#define DEVICE_CAPTURE_VIDEO_FAKE_VIDEO_CAPTURE_DEVICE_H_
#include <stdint.h>
@@ -18,9 +18,9 @@
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "base/time/time.h"
-#include "media/capture/video/video_capture_device.h"
+#include "device/capture/video/video_capture_device.h"
-namespace media {
+namespace device {
class CAPTURE_EXPORT FakeVideoCaptureDevice : public VideoCaptureDevice {
public:
@@ -38,7 +38,7 @@ class CAPTURE_EXPORT FakeVideoCaptureDevice : public VideoCaptureDevice {
std::unique_ptr<Client> client) override;
void StopAndDeAllocate() override;
void GetPhotoCapabilities(GetPhotoCapabilitiesCallback callback) override;
- void SetPhotoOptions(mojom::PhotoSettingsPtr settings,
+ void SetPhotoOptions(media::mojom::PhotoSettingsPtr settings,
SetPhotoOptionsCallback callback) override;
void TakePhoto(TakePhotoCallback callback) override;
@@ -77,6 +77,6 @@ class CAPTURE_EXPORT FakeVideoCaptureDevice : public VideoCaptureDevice {
DISALLOW_COPY_AND_ASSIGN(FakeVideoCaptureDevice);
};
-} // namespace media
+} // namespace device
-#endif // MEDIA_CAPTURE_VIDEO_FAKE_VIDEO_CAPTURE_DEVICE_H_
+#endif // DEVICE_CAPTURE_VIDEO_FAKE_VIDEO_CAPTURE_DEVICE_H_

Powered by Google App Engine
This is Rietveld 408576698