OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "media/capture/video/android/capture_jni_registrar.h" | 5 #include "media/capture/content/android/screen_capture_jni_registrar.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_registrar.h" | 8 #include "base/android/jni_registrar.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 | 10 |
11 #include "media/capture/video/android/video_capture_device_android.h" | 11 #include "media/capture/content/android/screen_capture_machine_android.h" |
12 #include "media/capture/video/android/video_capture_device_factory_android.h" | |
13 | 12 |
14 namespace media { | 13 namespace media { |
15 | 14 |
16 static base::android::RegistrationMethod kCaptureRegisteredMethods[] = { | 15 static base::android::RegistrationMethod kCaptureRegisteredMethods[] = { |
17 {"VideoCaptureDevice", | 16 {"ScreenCaptureMachine", |
18 VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice}, | 17 ScreenCaptureMachineAndroid::RegisterScreenCaptureMachine}, |
19 {"VideoCaptureDeviceFactory", | |
20 VideoCaptureDeviceFactoryAndroid::RegisterVideoCaptureDeviceFactory}, | |
21 }; | 18 }; |
22 | 19 |
23 bool RegisterCaptureJni(JNIEnv* env) { | 20 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!
| |
24 return base::android::RegisterNativeMethods( | 21 return base::android::RegisterNativeMethods( |
25 env, kCaptureRegisteredMethods, arraysize(kCaptureRegisteredMethods)); | 22 env, kCaptureRegisteredMethods, arraysize(kCaptureRegisteredMethods)); |
26 } | 23 } |
27 | 24 |
28 } // namespace media | 25 } // namespace media |
OLD | NEW |