| Index: device/capture/video/android/video_capture_device_factory_android.h
|
| diff --git a/media/capture/video/android/video_capture_device_factory_android.h b/device/capture/video/android/video_capture_device_factory_android.h
|
| similarity index 77%
|
| rename from media/capture/video/android/video_capture_device_factory_android.h
|
| rename to device/capture/video/android/video_capture_device_factory_android.h
|
| index aa1f36693ce6895edcefdaef833c06b0e0238967..bfc1a6e3856db963da463a3c5daf2afd4edbcd99 100644
|
| --- a/media/capture/video/android/video_capture_device_factory_android.h
|
| +++ b/device/capture/video/android/video_capture_device_factory_android.h
|
| @@ -2,16 +2,16 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
|
| -#define MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
|
| +#ifndef DEVICE_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
|
| +#define DEVICE_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
|
|
|
| -#include "media/capture/video/video_capture_device_factory.h"
|
| +#include "device/capture/video/video_capture_device_factory.h"
|
|
|
| #include <jni.h>
|
|
|
| #include "base/android/scoped_java_ref.h"
|
| #include "base/macros.h"
|
| -#include "media/capture/video/video_capture_device.h"
|
| +#include "device/capture/video/video_capture_device.h"
|
|
|
| namespace media {
|
|
|
| @@ -40,4 +40,4 @@ class CAPTURE_EXPORT VideoCaptureDeviceFactoryAndroid
|
| };
|
| } // namespace media
|
|
|
| -#endif // MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
|
| +#endif // DEVICE_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
|
|
|