| Index: device/capture/video/video_capture_device_descriptor.h
|
| diff --git a/media/capture/video/video_capture_device_descriptor.h b/device/capture/video/video_capture_device_descriptor.h
|
| similarity index 90%
|
| rename from media/capture/video/video_capture_device_descriptor.h
|
| rename to device/capture/video/video_capture_device_descriptor.h
|
| index 9bfbddedd78df736651e67086a0fcc2c3822d012..e586e10e5be26f69ddf3ef4ef72bf5791abe1c87 100644
|
| --- a/media/capture/video/video_capture_device_descriptor.h
|
| +++ b/device/capture/video/video_capture_device_descriptor.h
|
| @@ -2,18 +2,18 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_DESCRIPTOR_H_
|
| -#define MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_DESCRIPTOR_H_
|
| +#ifndef DEVICE_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_DESCRIPTOR_H_
|
| +#define DEVICE_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_DESCRIPTOR_H_
|
|
|
| #include <list>
|
| #include <string>
|
|
|
| -#include "media/capture/capture_export.h"
|
| +#include "device/capture/capture_export.h"
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| // A Java counterpart will be generated for this enum.
|
| -// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.media
|
| +// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.device
|
| enum class VideoCaptureApi {
|
| LINUX_V4L2_SINGLE_PLANE,
|
| WIN_MEDIA_FOUNDATION,
|
| @@ -86,6 +86,6 @@ struct CAPTURE_EXPORT VideoCaptureDeviceDescriptor {
|
|
|
| using VideoCaptureDeviceDescriptors = std::list<VideoCaptureDeviceDescriptor>;
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|
| -#endif // MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_DESCRIPTOR_H_
|
| +#endif // DEVICE_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_DESCRIPTOR_H_
|
|
|