| Index: device/capture/video/android/video_capture_device_android.h
|
| diff --git a/media/capture/video/android/video_capture_device_android.h b/device/capture/video/android/video_capture_device_android.h
|
| similarity index 93%
|
| rename from media/capture/video/android/video_capture_device_android.h
|
| rename to device/capture/video/android/video_capture_device_android.h
|
| index ce6fd9de6cba9a249b32fef760545827ff3c25c2..c47aea68da78ef189a0f1b9f7b9df3c5a6775c75 100644
|
| --- a/media/capture/video/android/video_capture_device_android.h
|
| +++ b/device/capture/video/android/video_capture_device_android.h
|
| @@ -2,8 +2,8 @@
|
| // 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_ANDROID_H_
|
| -#define MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
|
| +#ifndef DEVICE_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
|
| +#define DEVICE_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
|
|
|
| #include <jni.h>
|
| #include <string>
|
| @@ -13,8 +13,8 @@
|
| #include "base/synchronization/lock.h"
|
| #include "base/threading/thread.h"
|
| #include "base/time/time.h"
|
| -#include "media/capture/capture_export.h"
|
| -#include "media/capture/video/video_capture_device.h"
|
| +#include "device/capture/capture_export.h"
|
| +#include "device/capture/video/video_capture_device.h"
|
|
|
| namespace tracked_objects {
|
| class Location;
|
| @@ -115,4 +115,4 @@ class CAPTURE_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {
|
|
|
| } // namespace media
|
|
|
| -#endif // MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
|
| +#endif // DEVICE_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
|
|
|