| Index: device/capture/video/mac/video_capture_device_mac.h
|
| diff --git a/media/capture/video/mac/video_capture_device_mac.h b/device/capture/video/mac/video_capture_device_mac.h
|
| similarity index 93%
|
| rename from media/capture/video/mac/video_capture_device_mac.h
|
| rename to device/capture/video/mac/video_capture_device_mac.h
|
| index c084ba1bc4fd3e0ad2a5472369a6a0bbec6e50d3..97a2b1b81359adebbe0881879c7a5dba033e1b8d 100644
|
| --- a/media/capture/video/mac/video_capture_device_mac.h
|
| +++ b/device/capture/video/mac/video_capture_device_mac.h
|
| @@ -6,8 +6,8 @@
|
| // native capture API. AVFoundation is available in versions 10.7 (Lion) and
|
| // later.
|
|
|
| -#ifndef MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
|
| -#define MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
|
| +#ifndef DEVICE_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
|
| +#define DEVICE_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
|
|
|
| #import <Foundation/Foundation.h>
|
| #include <stdint.h>
|
| @@ -19,8 +19,8 @@
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| +#include "device/capture/video/video_capture_device.h"
|
| #include "media/base/video_capture_types.h"
|
| -#include "media/capture/video/video_capture_device.h"
|
|
|
| @class VideoCaptureDeviceAVFoundation;
|
|
|
| @@ -48,7 +48,7 @@ CAPTURE_EXPORT
|
| - (int32_t)transportType;
|
| @end
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| // Called by VideoCaptureManager to open, close and start, stop Mac video
|
| // capture devices.
|
| @@ -124,6 +124,6 @@ class VideoCaptureDeviceMac : public VideoCaptureDevice {
|
| DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceMac);
|
| };
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|
| -#endif // MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
|
| +#endif // DEVICE_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
|
|
|