Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: media/base/android/media_jni_registrar.cc

Issue 13290002: Revert 189210 "Add MODIFY_AUDIO_SETTINGS permission in Android m..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1453/src/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/audio_manager_base.h"
12 #include "media/base/android/media_player_bridge.h" 11 #include "media/base/android/media_player_bridge.h"
13 #include "media/base/android/media_player_listener.h" 12 #include "media/base/android/media_player_listener.h"
14 #include "media/video/capture/android/video_capture_device_android.h" 13 #include "media/video/capture/android/video_capture_device_android.h"
15 14
16 namespace media { 15 namespace media {
17 16
18 static base::android::RegistrationMethod kMediaRegisteredMethods[] = { 17 static base::android::RegistrationMethod kMediaRegisteredMethods[] = {
19 { "AudioManagerBase",
20 AudioManagerBase::RegisterAudioManager },
21 { "MediaPlayerBridge", 18 { "MediaPlayerBridge",
22 MediaPlayerBridge::RegisterMediaPlayerBridge }, 19 MediaPlayerBridge::RegisterMediaPlayerBridge },
23 { "MediaPlayerListener", 20 { "MediaPlayerListener",
24 MediaPlayerListener::RegisterMediaPlayerListener }, 21 MediaPlayerListener::RegisterMediaPlayerListener },
25 { "VideoCaptureDevice", 22 { "VideoCaptureDevice",
26 VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice }, 23 VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice },
27 }; 24 };
28 25
29 bool RegisterJni(JNIEnv* env) { 26 bool RegisterJni(JNIEnv* env) {
30 return base::android::RegisterNativeMethods( 27 return base::android::RegisterNativeMethods(
31 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); 28 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods));
32 } 29 }
33 30
34 } // namespace media 31 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698