diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 11:31:15 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 11:31:15 +0000 |
| commit | 13167fff3ada75bd8c8dd8c6acc558d64ecde053 (patch) | |
| tree | ca27eb32a3340db4ac10c077583c3a7082423ec9 /content/browser/speech/speech_recognizer_unittest.cc | |
| parent | 251ca36b35f7a9faef360c70acc84fc9a3ad1c40 (diff) | |
| download | chromium_src-13167fff3ada75bd8c8dd8c6acc558d64ecde053.zip chromium_src-13167fff3ada75bd8c8dd8c6acc558d64ecde053.tar.gz chromium_src-13167fff3ada75bd8c8dd8c6acc558d64ecde053.tar.bz2 | |
Move SpeechRecognizer delegate into its own header file and put it in the content namespace.
This reverts commit 3942a25369d4e15de6c47b0c1df59827eec49a5e.
This avoids having a nested class as it leads to too many includes in headers.
This fixes the two issues raised by Win bots:
- It includes speech_recognizer.h in certain source files to silence the warnings.
- It tags SpeechRecognizerDelegate with CONTENT_EXPORT because SpeechInputManager is deriving from it and it's tagged with CONTENT_EXPORT, so we have to export the base class to silence the warning on Windows.
BUG=98716
R=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9388038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/speech/speech_recognizer_unittest.cc')
| -rw-r--r-- | content/browser/speech/speech_recognizer_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/speech/speech_recognizer_unittest.cc b/content/browser/speech/speech_recognizer_unittest.cc index 953fcb0..17a18c9 100644 --- a/content/browser/speech/speech_recognizer_unittest.cc +++ b/content/browser/speech/speech_recognizer_unittest.cc @@ -6,6 +6,7 @@ #include "content/browser/browser_thread_impl.h" #include "content/browser/speech/speech_recognizer.h" +#include "content/public/browser/speech_recognizer_delegate.h" #include "content/test/test_url_fetcher_factory.h" #include "media/audio/audio_manager.h" #include "media/audio/test_audio_input_controller_factory.h" @@ -21,7 +22,7 @@ using media::TestAudioInputControllerFactory; namespace speech_input { -class SpeechRecognizerTest : public SpeechRecognizerDelegate, +class SpeechRecognizerTest : public content::SpeechRecognizerDelegate, public testing::Test { public: SpeechRecognizerTest() @@ -44,7 +45,7 @@ class SpeechRecognizerTest : public SpeechRecognizerDelegate, audio_packet_.resize(audio_packet_length_bytes); } - // SpeechRecognizer::Delegate methods. + // Overridden from content::SpeechRecognizerDelegate: virtual void SetRecognitionResult( int caller_id, const content::SpeechInputResult& result) OVERRIDE { |