| Index: device/capture/video/win/video_capture_device_mf_win.h
|
| diff --git a/media/capture/video/win/video_capture_device_mf_win.h b/device/capture/video/win/video_capture_device_mf_win.h
|
| similarity index 87%
|
| rename from media/capture/video/win/video_capture_device_mf_win.h
|
| rename to device/capture/video/win/video_capture_device_mf_win.h
|
| index 68cd4f8b489bb46a59ecda81ecb34add7e3291bf..3a1d99e318fdc8522f2207ad372d9e69acb8662f 100644
|
| --- a/media/capture/video/win/video_capture_device_mf_win.h
|
| +++ b/device/capture/video/win/video_capture_device_mf_win.h
|
| @@ -6,8 +6,8 @@
|
| // DirectShow is used for capturing. DirectShow provide its own threads
|
| // for capturing.
|
|
|
| -#ifndef MEDIA_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_MF_WIN_H_
|
| -#define MEDIA_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_MF_WIN_H_
|
| +#ifndef DEVICE_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_MF_WIN_H_
|
| +#define DEVICE_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_MF_WIN_H_
|
|
|
| #include <mfidl.h>
|
| #include <mfreadwrite.h>
|
| @@ -19,8 +19,8 @@
|
| #include "base/synchronization/lock.h"
|
| #include "base/threading/non_thread_safe.h"
|
| #include "base/win/scoped_comptr.h"
|
| -#include "media/capture/capture_export.h"
|
| -#include "media/capture/video/video_capture_device.h"
|
| +#include "device/capture/capture_export.h"
|
| +#include "device/capture/video/video_capture_device.h"
|
|
|
| interface IMFSourceReader;
|
|
|
| @@ -28,7 +28,7 @@ namespace tracked_objects {
|
| class Location;
|
| } // namespace tracked_objects
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| class MFReaderCallback;
|
|
|
| @@ -76,6 +76,6 @@ class CAPTURE_EXPORT VideoCaptureDeviceMFWin : public base::NonThreadSafe,
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceMFWin);
|
| };
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|
| -#endif // MEDIA_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_MF_WIN_H_
|
| +#endif // DEVICE_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_MF_WIN_H_
|
|
|