| Index: device/capture/video/android/capture_jni_registrar.cc
|
| diff --git a/media/capture/video/android/capture_jni_registrar.cc b/device/capture/video/android/capture_jni_registrar.cc
|
| similarity index 73%
|
| rename from media/capture/video/android/capture_jni_registrar.cc
|
| rename to device/capture/video/android/capture_jni_registrar.cc
|
| index 551db1a59c598727fea5ff1cf24ef81f86e8c4b9..67b4a62e5fd7b51943b4f674476857110a131a83 100644
|
| --- a/media/capture/video/android/capture_jni_registrar.cc
|
| +++ b/device/capture/video/android/capture_jni_registrar.cc
|
| @@ -2,14 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "media/capture/video/android/capture_jni_registrar.h"
|
| +#include "device/capture/video/android/capture_jni_registrar.h"
|
|
|
| #include "base/android/jni_android.h"
|
| #include "base/android/jni_registrar.h"
|
| #include "base/macros.h"
|
| -#include "media/capture/video/android/video_capture_device_android.h"
|
| +#include "device/capture/video/android/video_capture_device_android.h"
|
|
|
| -namespace media {
|
| +namespace device {
|
| +namespace android {
|
|
|
| static base::android::RegistrationMethod kCaptureRegisteredMethods[] = {
|
| {"VideoCaptureDevice",
|
| @@ -21,4 +22,5 @@ bool RegisterCaptureJni(JNIEnv* env) {
|
| env, kCaptureRegisteredMethods, arraysize(kCaptureRegisteredMethods));
|
| }
|
|
|
| -} // namespace media
|
| +} // namespace android
|
| +} // namespace device
|
|
|