diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 19:02:34 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 19:02:34 +0000 |
| commit | a0eb47d1c442979d2a545d819debb39888cc3e52 (patch) | |
| tree | 03fd7506d0a345fc519a9aecc76f5d7aa425d1ef /media/base | |
| parent | 5c307f90c5c15796e9db3a4ad9f23b5b4ad99fdb (diff) | |
| download | chromium_src-a0eb47d1c442979d2a545d819debb39888cc3e52.zip chromium_src-a0eb47d1c442979d2a545d819debb39888cc3e52.tar.gz chromium_src-a0eb47d1c442979d2a545d819debb39888cc3e52.tar.bz2 | |
Revert 194371
Looks like its breaking blink build. Contact jchaffraix for more info.
> Refactor android specific code in AudioManagerBase class.
>
> Move android specific code into AudioManagerAndroid class.
>
> Contributed by leozwang@chromium.org (https://chromiumcodereview.appspot.com/14265014/).
>
> BUG=231468
>
> Review URL: https://codereview.chromium.org/14053012
TBR=wjia@chromium.org
Review URL: https://codereview.chromium.org/14302003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194407 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/android/media_jni_registrar.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/base/android/media_jni_registrar.cc b/media/base/android/media_jni_registrar.cc index 9cedfac..2ec2634 100644 --- a/media/base/android/media_jni_registrar.cc +++ b/media/base/android/media_jni_registrar.cc @@ -8,7 +8,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" -#include "media/audio/android/audio_manager_android.h" +#include "media/audio/audio_manager_base.h" #include "media/base/android/media_player_bridge.h" #include "media/base/android/media_player_listener.h" #include "media/base/android/webaudio_media_codec_bridge.h" @@ -17,8 +17,8 @@ namespace media { static base::android::RegistrationMethod kMediaRegisteredMethods[] = { - { "AudioManagerAndroid", - AudioManagerAndroid::RegisterAudioManager }, + { "AudioManagerBase", + AudioManagerBase::RegisterAudioManager }, { "MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge }, { "MediaPlayerListener", |