| 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 94%
|
| rename from media/capture/video/mac/video_capture_device_mac.h
|
| rename to device/capture/video/mac/video_capture_device_mac.h
|
| index 7eff128ab1e0b50ee05c893364027f5625fb78af..e109503a03b7344f35154614952d4901f079d4d6 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;
|
|
|
| @@ -121,4 +121,4 @@ class VideoCaptureDeviceMac : public VideoCaptureDevice {
|
|
|
| } // namespace media
|
|
|
| -#endif // MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
|
| +#endif // DEVICE_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
|
|
|