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

Unified Diff: device/capture/video/video_capture_device.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
« no previous file with comments | « device/capture/video/scoped_result_callback.h ('k') | device/capture/video/video_capture_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/capture/video/video_capture_device.h
diff --git a/media/capture/video/video_capture_device.h b/device/capture/video/video_capture_device.h
similarity index 98%
rename from media/capture/video/video_capture_device.h
rename to device/capture/video/video_capture_device.h
index 1a5721f70173bc76f776b2bd67431b246fa13672..5d789c694fae8f5daccf1f15fe0547bcab4d14ec 100644
--- a/media/capture/video/video_capture_device.h
+++ b/device/capture/video/video_capture_device.h
@@ -9,8 +9,8 @@
// VideoCaptureManager. Capturing is done on other threads, depending on the OS
// specific implementation.
-#ifndef MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_H_
-#define MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_H_
+#ifndef DEVICE_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_H_
+#define DEVICE_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_H_
#include <stddef.h>
#include <stdint.h>
@@ -26,10 +26,10 @@
#include "base/single_thread_task_runner.h"
#include "base/time/time.h"
#include "build/build_config.h"
+#include "device/capture/capture_export.h"
+#include "device/capture/video/scoped_result_callback.h"
#include "media/base/video_capture_types.h"
#include "media/base/video_frame.h"
-#include "media/capture/capture_export.h"
-#include "media/capture/video/scoped_result_callback.h"
#include "media/mojo/interfaces/image_capture.mojom.h"
#include "mojo/public/cpp/bindings/array.h"
#include "ui/gfx/gpu_memory_buffer.h"
@@ -342,4 +342,4 @@ class CAPTURE_EXPORT VideoCaptureDevice {
} // namespace media
-#endif // MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_H_
+#endif // DEVICE_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_H_
« no previous file with comments | « device/capture/video/scoped_result_callback.h ('k') | device/capture/video/video_capture_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698