| 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 89%
|
| rename from media/capture/video/win/video_capture_device_win.h
|
| rename to device/capture/video/win/video_capture_device_win.h
|
| index 12ae25b476d7660e1c964df2af7bb9e59cded767..81cd492b6c9d843bc60467d7994848997e116e43 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,17 +19,17 @@
|
| #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;
|
| } // namespace tracked_objects
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| // All the methods in the class can only be run on a COM initialized thread.
|
| class VideoCaptureDeviceWin : public VideoCaptureDevice,
|
| @@ -120,6 +120,6 @@ class VideoCaptureDeviceWin : public VideoCaptureDevice,
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceWin);
|
| };
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|
| -#endif // MEDIA_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
|
| +#endif // DEVICE_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
|
|
|