| Index: device/capture/video/mac/video_capture_device_factory_mac.mm
|
| diff --git a/media/capture/video/mac/video_capture_device_factory_mac.mm b/device/capture/video/mac/video_capture_device_factory_mac.mm
|
| similarity index 94%
|
| rename from media/capture/video/mac/video_capture_device_factory_mac.mm
|
| rename to device/capture/video/mac/video_capture_device_factory_mac.mm
|
| index abf547ef2de8849f98aacd843fe6c167b5b60c8f..0b6455ab647fe5f91a88944eece8c83468493a48 100644
|
| --- a/media/capture/video/mac/video_capture_device_factory_mac.mm
|
| +++ b/device/capture/video/mac/video_capture_device_factory_mac.mm
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "media/capture/video/mac/video_capture_device_factory_mac.h"
|
| +#include "device/capture/video/mac/video_capture_device_factory_mac.h"
|
|
|
| #import <IOKit/audio/IOAudioTypes.h>
|
| #include <stddef.h>
|
| @@ -15,12 +15,12 @@
|
| #include "base/profiler/scoped_tracker.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/task_runner_util.h"
|
| +#import "device/capture/video/mac/video_capture_device_avfoundation_mac.h"
|
| +#import "device/capture/video/mac/video_capture_device_decklink_mac.h"
|
| +#include "device/capture/video/mac/video_capture_device_mac.h"
|
| #import "media/base/mac/avfoundation_glue.h"
|
| -#import "media/capture/video/mac/video_capture_device_avfoundation_mac.h"
|
| -#import "media/capture/video/mac/video_capture_device_decklink_mac.h"
|
| -#include "media/capture/video/mac/video_capture_device_mac.h"
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| // Blacklisted devices are identified by a characteristic trailing substring of
|
| // uniqueId. At the moment these are just Blackmagic devices.
|
| @@ -133,4 +133,4 @@ VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory(
|
| return new VideoCaptureDeviceFactoryMac();
|
| }
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|