diff options
| author | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-02 19:50:50 +0000 |
|---|---|---|
| committer | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-02 19:50:50 +0000 |
| commit | f3a1b854e9afeeee2121abda50df6da9242c4410 (patch) | |
| tree | 5bd99fea32252ef037bc8b936ec19f04bd50e868 /content/browser/speech/speech_recognizer_impl.h | |
| parent | 897bfb5aaaa57f0338a77fada1d5d3f9c3b38226 (diff) | |
| download | chromium_src-f3a1b854e9afeeee2121abda50df6da9242c4410.zip chromium_src-f3a1b854e9afeeee2121abda50df6da9242c4410.tar.gz chromium_src-f3a1b854e9afeeee2121abda50df6da9242c4410.tar.bz2 | |
Revert 130180 - Move media/audio files into media namespace
BUG=115187
TEST=compiles and runs without breaking audio tag; media_unittests, content_unittests
Review URL: https://chromiumcodereview.appspot.com/9805001
TBR=vrk@google.com
Review URL: https://chromiumcodereview.appspot.com/9965076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/speech/speech_recognizer_impl.h')
| -rw-r--r-- | content/browser/speech/speech_recognizer_impl.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/content/browser/speech/speech_recognizer_impl.h b/content/browser/speech/speech_recognizer_impl.h index 516dfea..eed04bc 100644 --- a/content/browser/speech/speech_recognizer_impl.h +++ b/content/browser/speech/speech_recognizer_impl.h @@ -22,7 +22,6 @@ struct SpeechRecognitionResult; namespace media { class AudioInputController; -class AudioManager; } namespace speech { @@ -92,10 +91,10 @@ class CONTENT_EXPORT SpeechRecognizerImpl // without blocking the IO thread. void CloseAudioControllerAsynchronously(); - void SetAudioManagerForTesting(media::AudioManager* audio_manager); + void SetAudioManagerForTesting(AudioManager* audio_manager); content::SpeechRecognitionEventListener* listener_; - media::AudioManager* testing_audio_manager_; + AudioManager* testing_audio_manager_; scoped_ptr<SpeechRecognitionEngine> recognition_engine_; Endpointer endpointer_; scoped_refptr<media::AudioInputController> audio_controller_; |