| Index: device/capture/video/mac/video_capture_device_avfoundation_mac.h
|
| diff --git a/media/capture/video/mac/video_capture_device_avfoundation_mac.h b/device/capture/video/mac/video_capture_device_avfoundation_mac.h
|
| similarity index 94%
|
| rename from media/capture/video/mac/video_capture_device_avfoundation_mac.h
|
| rename to device/capture/video/mac/video_capture_device_avfoundation_mac.h
|
| index 69082e7aac0d7f9af2d3a4b8963313e1f241c73c..e40ea3d298b8a5a5a9f0fd05badf65e35a64670e 100644
|
| --- a/media/capture/video/mac/video_capture_device_avfoundation_mac.h
|
| +++ b/device/capture/video/mac/video_capture_device_avfoundation_mac.h
|
| @@ -2,17 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_AVFOUNDATION_MAC_H_
|
| -#define MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_AVFOUNDATION_MAC_H_
|
| +#ifndef DEVICE_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_AVFOUNDATION_MAC_H_
|
| +#define DEVICE_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_AVFOUNDATION_MAC_H_
|
|
|
| #import <Foundation/Foundation.h>
|
|
|
| #import "base/mac/scoped_nsobject.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/threading/thread_checker.h"
|
| +#include "device/capture/video/video_capture_device.h"
|
| #import "media/base/mac/avfoundation_glue.h"
|
| #include "media/base/video_capture_types.h"
|
| -#include "media/capture/video/video_capture_device.h"
|
|
|
| namespace media {
|
| class VideoCaptureDeviceMac;
|
| @@ -124,4 +124,4 @@ class VideoCaptureDeviceMac;
|
|
|
| @end
|
|
|
| -#endif // MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_AVFOUNDATION_MAC_H_
|
| +#endif // DEVICE_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_AVFOUNDATION_MAC_H_
|
|
|