| Index: device/capture/video/android/photo_capabilities.h
|
| diff --git a/media/capture/video/android/photo_capabilities.h b/device/capture/video/android/photo_capabilities.h
|
| similarity index 78%
|
| rename from media/capture/video/android/photo_capabilities.h
|
| rename to device/capture/video/android/photo_capabilities.h
|
| index de6d38f204dacc7512fb50e63bc9804ba04df789..7a79f8c628b14ceffa63526819719d85a0023244 100644
|
| --- a/media/capture/video/android/photo_capabilities.h
|
| +++ b/device/capture/video/android/photo_capabilities.h
|
| @@ -2,15 +2,15 @@
|
| // 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_PHOTO_CAPABILITIES_H_
|
| -#define MEDIA_CAPTURE_VIDEO_ANDROID_PHOTO_CAPABILITIES_H_
|
| +#ifndef DEVICE_CAPTURE_VIDEO_ANDROID_PHOTO_CAPABILITIES_H_
|
| +#define DEVICE_CAPTURE_VIDEO_ANDROID_PHOTO_CAPABILITIES_H_
|
|
|
| #include <jni.h>
|
| #include <string>
|
|
|
| #include "base/android/scoped_java_ref.h"
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| class PhotoCapabilities {
|
| public:
|
| @@ -35,6 +35,6 @@ class PhotoCapabilities {
|
| const base::android::ScopedJavaLocalRef<jobject> object_;
|
| };
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|
| -#endif // MEDIA_CAPTURE_VIDEO_ANDROID_PHOTO_CAPABILITIES_H_
|
| +#endif // DEVICE_CAPTURE_VIDEO_ANDROID_PHOTO_CAPABILITIES_H_
|
|
|