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

Unified Diff: device/capture/video/win/video_capture_device_win.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/win/video_capture_device_win.h
diff --git a/media/capture/video/win/video_capture_device_win.h b/device/capture/video/win/video_capture_device_win.h
similarity index 90%
rename from media/capture/video/win/video_capture_device_win.h
rename to device/capture/video/win/video_capture_device_win.h
index 9ef2b0fb0ccffac0617a8517958fb348f40f86e4..91e036839afa73fa92b38e7650bdd8241f582425 100644
--- a/media/capture/video/win/video_capture_device_win.h
+++ b/device/capture/video/win/video_capture_device_win.h
@@ -5,8 +5,8 @@
// Windows specific implementation of VideoCaptureDevice. DirectShow is used for
// capturing. DirectShow provide its own threads for capturing.
-#ifndef MEDIA_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
-#define MEDIA_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
+#ifndef DEVICE_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
+#define DEVICE_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
// Avoid including strsafe.h via dshow as it will cause build warnings.
#define NO_DSHOW_STRSAFE
@@ -19,11 +19,11 @@
#include "base/macros.h"
#include "base/threading/thread_checker.h"
#include "base/win/scoped_comptr.h"
+#include "device/capture/video/video_capture_device.h"
+#include "device/capture/video/win/capability_list_win.h"
+#include "device/capture/video/win/sink_filter_win.h"
+#include "device/capture/video/win/sink_input_pin_win.h"
#include "media/base/video_capture_types.h"
-#include "media/capture/video/video_capture_device.h"
-#include "media/capture/video/win/capability_list_win.h"
-#include "media/capture/video/win/sink_filter_win.h"
-#include "media/capture/video/win/sink_input_pin_win.h"
namespace tracked_objects {
class Location;
@@ -121,4 +121,4 @@ class VideoCaptureDeviceWin : public VideoCaptureDevice,
} // namespace media
-#endif // MEDIA_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
+#endif // DEVICE_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
« no previous file with comments | « device/capture/video/win/video_capture_device_mf_win.cc ('k') | device/capture/video/win/video_capture_device_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698