| Index: device/capture/video/linux/video_capture_device_factory_linux.h
|
| diff --git a/media/capture/video/linux/video_capture_device_factory_linux.h b/device/capture/video/linux/video_capture_device_factory_linux.h
|
| similarity index 78%
|
| rename from media/capture/video/linux/video_capture_device_factory_linux.h
|
| rename to device/capture/video/linux/video_capture_device_factory_linux.h
|
| index 036be89650b0b1cd9bd85e8ef3f366a5cdf1027b..d97ba0197daf447b34f8aa95c7fd92522836539a 100644
|
| --- a/media/capture/video/linux/video_capture_device_factory_linux.h
|
| +++ b/device/capture/video/linux/video_capture_device_factory_linux.h
|
| @@ -4,15 +4,15 @@
|
|
|
| // Implementation of a VideoCaptureDeviceFactoryLinux class.
|
|
|
| -#ifndef MEDIA_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_FACTORY_LINUX_H_
|
| -#define MEDIA_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_FACTORY_LINUX_H_
|
| +#ifndef DEVICE_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_FACTORY_LINUX_H_
|
| +#define DEVICE_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_FACTORY_LINUX_H_
|
|
|
| -#include "media/capture/video/video_capture_device_factory.h"
|
| +#include "device/capture/video/video_capture_device_factory.h"
|
|
|
| #include "base/macros.h"
|
| #include "media/base/video_capture_types.h"
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| // Extension of VideoCaptureDeviceFactory to create and manipulate Linux
|
| // devices.
|
| @@ -38,5 +38,5 @@ class CAPTURE_EXPORT VideoCaptureDeviceFactoryLinux
|
| DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryLinux);
|
| };
|
|
|
| -} // namespace media
|
| -#endif // MEDIA_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_FACTORY_LINUX_H_
|
| +} // namespace device
|
| +#endif // DEVICE_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_FACTORY_LINUX_H_
|
|
|