Index: media/capture/content/android/screen_capture_jni_registrar.cc |
diff --git a/media/capture/video/android/capture_jni_registrar.cc b/media/capture/content/android/screen_capture_jni_registrar.cc |
similarity index 53% |
copy from media/capture/video/android/capture_jni_registrar.cc |
copy to media/capture/content/android/screen_capture_jni_registrar.cc |
index 027583a1898609ee174f0eea352bc0d1c2b8ab22..756fee9ee82e0252c342a674e46964ba3b34cc74 100644 |
--- a/media/capture/video/android/capture_jni_registrar.cc |
+++ b/media/capture/content/android/screen_capture_jni_registrar.cc |
@@ -2,25 +2,22 @@ |
// 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 "media/capture/content/android/screen_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 "media/capture/video/android/video_capture_device_factory_android.h" |
+#include "media/capture/content/android/screen_capture_machine_android.h" |
namespace media { |
static base::android::RegistrationMethod kCaptureRegisteredMethods[] = { |
- {"VideoCaptureDevice", |
- VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice}, |
- {"VideoCaptureDeviceFactory", |
- VideoCaptureDeviceFactoryAndroid::RegisterVideoCaptureDeviceFactory}, |
+ {"ScreenCaptureMachine", |
+ ScreenCaptureMachineAndroid::RegisterScreenCaptureMachine}, |
}; |
-bool RegisterCaptureJni(JNIEnv* env) { |
+bool RegisterScreenCaptureJni(JNIEnv* env) { |
mcasas
2016/05/19 19:11:41
To avoid this incorrect diff-ing, upload with
git
braveyao
2016/05/20 22:27:25
Will try. Good to know!
|
return base::android::RegisterNativeMethods( |
env, kCaptureRegisteredMethods, arraysize(kCaptureRegisteredMethods)); |
} |