Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_ | 5 #ifndef CHROME_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_ |
| 6 #define CHROME_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_ | 6 #define CHROME_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_ |
| 7 | 7 |
| 8 #include "base/ref_counted.h" | |
| 9 #include "base/scoped_ptr.h" | |
| 10 #include "media/audio/audio_input_controller.h" | |
| 11 #include "chrome/browser/speech/speech_recognition_request.h" | |
| 12 #include "chrome/browser/speech/endpointer/endpointer.h" | |
| 13 #include <list> | 8 #include <list> |
| 14 #include <string> | 9 #include <string> |
| 15 #include <utility> | 10 #include <utility> |
| 11 #include "base/ref_counted.h" | |
|
tfarina
2010/08/25 13:43:55
nit: add a blank line between utility and base/..
| |
| 12 #include "base/scoped_ptr.h" | |
| 13 #include "chrome/browser/speech/endpointer/endpointer.h" | |
| 14 #include "chrome/browser/speech/speech_recognition_request.h" | |
| 15 #include "media/audio/audio_input_controller.h" | |
| 16 | 16 |
| 17 namespace speech_input { | 17 namespace speech_input { |
| 18 | 18 |
| 19 // Holds the details of a particular webkit element making a speech request. | 19 // Holds the details of a particular webkit element making a speech request. |
| 20 // SpeechInputCallerId::first holds the ID of the render view and | 20 // SpeechInputCallerId::first holds the ID of the render view and |
| 21 // SpeechInputCallerId::second holds the request ID given by the element. | 21 // SpeechInputCallerId::second holds the request ID given by the element. |
| 22 typedef std::pair<int, int> SpeechInputCallerId; | 22 typedef std::pair<int, int> SpeechInputCallerId; |
| 23 | 23 |
| 24 class SpeexEncoder; | 24 class SpeexEncoder; |
| 25 | 25 |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 103 | 103 |
| 104 // This typedef is to workaround the issue with certain versions of | 104 // This typedef is to workaround the issue with certain versions of |
| 105 // Visual Studio where it gets confused between multiple Delegate | 105 // Visual Studio where it gets confused between multiple Delegate |
| 106 // classes and gives a C2500 error. (I saw this error on the try bots - | 106 // classes and gives a C2500 error. (I saw this error on the try bots - |
| 107 // the workaround was not needed for my machine). | 107 // the workaround was not needed for my machine). |
| 108 typedef SpeechRecognizer::Delegate SpeechRecognizerDelegate; | 108 typedef SpeechRecognizer::Delegate SpeechRecognizerDelegate; |
| 109 | 109 |
| 110 } // namespace speech_input | 110 } // namespace speech_input |
| 111 | 111 |
| 112 #endif // CHROME_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_ | 112 #endif // CHROME_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_ |
| OLD | NEW |