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

Unified Diff: content/browser/speech/speech_recognizer_impl.h

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix various compiler errors Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/speech/speech_recognizer_impl.h
diff --git a/content/browser/speech/speech_recognizer_impl.h b/content/browser/speech/speech_recognizer_impl.h
index 1b93fcd01b337763c184e5e118806ab9b42c22cd..a103be0e3fe2c0a4f47a5ea76968d75ebd674527 100644
--- a/content/browser/speech/speech_recognizer_impl.h
+++ b/content/browser/speech/speech_recognizer_impl.h
@@ -17,12 +17,14 @@
#include "content/public/common/speech_recognition_result.h"
#include "media/audio/audio_input_controller.h"
-class AudioManager;
-
namespace content {
class SpeechRecognitionEventListener;
}
+namespace media {
+class AudioManager;
+}
+
namespace speech {
// Records audio, sends recorded audio to server and translates server response
@@ -85,7 +87,7 @@ class CONTENT_EXPORT SpeechRecognizerImpl
// Helper method which closes the audio controller and blocks until done.
void CloseAudioControllerSynchronously();
- void SetAudioManagerForTesting(AudioManager* audio_manager);
+ void SetAudioManagerForTesting(media::AudioManager* audio_manager);
content::SpeechRecognitionEventListener* listener_;
int caller_id_;
@@ -103,7 +105,7 @@ class CONTENT_EXPORT SpeechRecognizerImpl
Endpointer endpointer_;
int num_samples_recorded_;
float audio_level_;
- AudioManager* audio_manager_;
+ media::AudioManager* audio_manager_;
DISALLOW_COPY_AND_ASSIGN(SpeechRecognizerImpl);
};

Powered by Google App Engine
This is Rietveld 408576698