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

Unified Diff: device/capture/video/linux/video_capture_device_linux.h

Issue 2143903003: [WIP] Move media/capture to device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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/linux/video_capture_device_linux.h
diff --git a/media/capture/video/linux/video_capture_device_linux.h b/device/capture/video/linux/video_capture_device_linux.h
similarity index 87%
rename from media/capture/video/linux/video_capture_device_linux.h
rename to device/capture/video/linux/video_capture_device_linux.h
index 49ec2e461839f9df0361f66bcae3345b74ac21e7..3c382eba6d6323eba9756ba976890530511f6838 100644
--- a/media/capture/video/linux/video_capture_device_linux.h
+++ b/device/capture/video/linux/video_capture_device_linux.h
@@ -7,8 +7,8 @@
// capturing so this implementation uses a Chromium thread for fetching frames
// from V4L2.
-#ifndef MEDIA_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
-#define MEDIA_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
+#ifndef DEVICE_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
+#define DEVICE_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
#include <stdint.h>
@@ -18,8 +18,8 @@
#include "base/files/scoped_file.h"
#include "base/macros.h"
#include "base/threading/thread.h"
+#include "device/capture/video/video_capture_device.h"
#include "media/base/video_capture_types.h"
-#include "media/capture/video/video_capture_device.h"
namespace media {
@@ -59,4 +59,4 @@ class VideoCaptureDeviceLinux : public VideoCaptureDevice {
} // namespace media
-#endif // MEDIA_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
+#endif // DEVICE_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_

Powered by Google App Engine
This is Rietveld 408576698