| Index: content/browser/speech/speech_recognition_manager_impl.cc
|
| diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc
|
| index a20356b7b08cd89184ca70d6ac4e8c00fbc293f3..c9e470c29d1173ff87b08894b6d11795e6f4d5f2 100644
|
| --- a/content/browser/speech/speech_recognition_manager_impl.cc
|
| +++ b/content/browser/speech/speech_recognition_manager_impl.cc
|
| @@ -26,7 +26,6 @@
|
| #include "content/public/common/speech_recognition_error.h"
|
| #include "content/public/common/speech_recognition_result.h"
|
| #include "media/audio/audio_device_description.h"
|
| -#include "media/audio/audio_manager.h"
|
| #include "url/gurl.h"
|
| #include "url/origin.h"
|
|
|
| @@ -44,11 +43,6 @@ namespace {
|
|
|
| SpeechRecognitionManagerImpl* g_speech_recognition_manager_impl;
|
|
|
| -void ShowAudioInputSettingsOnFileThread(media::AudioManager* audio_manager) {
|
| - DCHECK_CURRENTLY_ON(BrowserThread::FILE);
|
| - audio_manager->ShowAudioInputSettings();
|
| -}
|
| -
|
| } // namespace
|
|
|
| SpeechRecognitionManager* SpeechRecognitionManager::GetInstance() {
|
| @@ -67,15 +61,14 @@ SpeechRecognitionManagerImpl* SpeechRecognitionManagerImpl::GetInstance() {
|
| }
|
|
|
| SpeechRecognitionManagerImpl::SpeechRecognitionManagerImpl(
|
| - media::AudioManager* audio_manager,
|
| - MediaStreamManager* media_stream_manager)
|
| - : audio_manager_(audio_manager),
|
| - media_stream_manager_(media_stream_manager),
|
| + MediaStreamManager* media_stream_manager)
|
| + : media_stream_manager_(media_stream_manager),
|
| primary_session_id_(kSessionIDInvalid),
|
| last_session_id_(kSessionIDInvalid),
|
| is_dispatching_event_(false),
|
| - delegate_(GetContentClient()->browser()->
|
| - CreateSpeechRecognitionManagerDelegate()),
|
| + delegate_(GetContentClient()
|
| + ->browser()
|
| + ->CreateSpeechRecognitionManagerDelegate()),
|
| weak_factory_(this) {
|
| DCHECK(!g_speech_recognition_manager_impl);
|
| g_speech_recognition_manager_impl = this;
|
| @@ -649,18 +642,6 @@ SpeechRecognitionManagerImpl::GetSessionConfig(int session_id) const {
|
| return GetSession(session_id)->config;
|
| }
|
|
|
| -bool SpeechRecognitionManagerImpl::HasAudioInputDevices() {
|
| - return audio_manager_->HasAudioInputDevices();
|
| -}
|
| -
|
| -void SpeechRecognitionManagerImpl::ShowAudioInputSettings() {
|
| - // Since AudioManager::ShowAudioInputSettings can potentially launch external
|
| - // processes, do that in the FILE thread to not block the calling threads.
|
| - BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
|
| - base::Bind(&ShowAudioInputSettingsOnFileThread,
|
| - audio_manager_));
|
| -}
|
| -
|
| SpeechRecognitionManagerImpl::Session::Session()
|
| : id(kSessionIDInvalid),
|
| abort_requested(false),
|
|
|