| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/base/android/media_jni_registrar.h" | 5 #include "media/base/android/media_jni_registrar.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
| 9 #include "base/android/jni_registrar.h" | 9 #include "base/android/jni_registrar.h" |
| 10 | 10 |
| 11 #include "media/audio/android/audio_manager_android.h" |
| 11 #include "media/base/android/media_player_bridge.h" | 12 #include "media/base/android/media_player_bridge.h" |
| 12 #include "media/base/android/media_player_listener.h" | 13 #include "media/base/android/media_player_listener.h" |
| 13 #include "media/video/capture/android/video_capture_device_android.h" | 14 #include "media/video/capture/android/video_capture_device_android.h" |
| 14 | 15 |
| 15 namespace media { | 16 namespace media { |
| 16 | 17 |
| 17 static base::android::RegistrationMethod kMediaRegisteredMethods[] = { | 18 static base::android::RegistrationMethod kMediaRegisteredMethods[] = { |
| 19 { "AudioManagerAndroid", |
| 20 AudioManagerAndroid::RegisterAudioManager }, |
| 18 { "MediaPlayerBridge", | 21 { "MediaPlayerBridge", |
| 19 MediaPlayerBridge::RegisterMediaPlayerBridge }, | 22 MediaPlayerBridge::RegisterMediaPlayerBridge }, |
| 20 { "MediaPlayerListener", | 23 { "MediaPlayerListener", |
| 21 MediaPlayerListener::RegisterMediaPlayerListener }, | 24 MediaPlayerListener::RegisterMediaPlayerListener }, |
| 22 { "VideoCaptureDevice", | 25 { "VideoCaptureDevice", |
| 23 VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice }, | 26 VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice }, |
| 24 }; | 27 }; |
| 25 | 28 |
| 26 bool RegisterJni(JNIEnv* env) { | 29 bool RegisterJni(JNIEnv* env) { |
| 27 return base::android::RegisterNativeMethods( | 30 return base::android::RegisterNativeMethods( |
| 28 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); | 31 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); |
| 29 } | 32 } |
| 30 | 33 |
| 31 } // namespace media | 34 } // namespace media |
| OLD | NEW |