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

Unified Diff: device/capture/video/win/capability_list_win.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/win/capability_list_win.h
diff --git a/media/capture/video/win/capability_list_win.h b/device/capture/video/win/capability_list_win.h
similarity index 82%
rename from media/capture/video/win/capability_list_win.h
rename to device/capture/video/win/capability_list_win.h
index 526f67c15fc1c03710179f398f3ebcd64df69176..025d6ffae9456382b4b47e1db4c18540d4256b70 100644
--- a/media/capture/video/win/capability_list_win.h
+++ b/device/capture/video/win/capability_list_win.h
@@ -6,15 +6,17 @@
// DirectShow is used for capturing. DirectShow provide its own threads
// for capturing.
-#ifndef MEDIA_CAPTURE_VIDEO_WIN_CAPABILITY_LIST_WIN_H_
-#define MEDIA_CAPTURE_VIDEO_WIN_CAPABILITY_LIST_WIN_H_
+#ifndef DEVICE_CAPTURE_VIDEO_WIN_CAPABILITY_LIST_WIN_H_
+#define DEVICE_CAPTURE_VIDEO_WIN_CAPABILITY_LIST_WIN_H_
#include <list>
#include <windows.h>
#include "media/base/video_capture_types.h"
-namespace media {
+namespace device {
+
+using media::VideoCaptureFormat;
struct CapabilityWin {
CapabilityWin(int index, const VideoCaptureFormat& format)
@@ -41,6 +43,6 @@ const CapabilityWin& GetBestMatchedCapability(
const VideoCaptureFormat& requested,
const CapabilityList& capabilities);
-} // namespace media
+} // namespace device
-#endif // MEDIA_CAPTURE_VIDEO_WIN_CAPABILITY_LIST_WIN_H_
+#endif // DEVICE_CAPTURE_VIDEO_WIN_CAPABILITY_LIST_WIN_H_
« no previous file with comments | « device/capture/video/video_capture_device_unittest.cc ('k') | device/capture/video/win/capability_list_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698