diff options
author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 22:11:57 +0000 |
---|---|---|
committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 22:11:57 +0000 |
commit | 8d128d6b9ef0096c874fafb9f80cbb5a03c98f4c (patch) | |
tree | 6d15da0c38831ea9180d3d90caa66d5adc7cb000 /content/browser/speech | |
parent | 8ea5d4bd1f750572bec6b6b73732bba147f0be42 (diff) | |
download | chromium_src-8d128d6b9ef0096c874fafb9f80cbb5a03c98f4c.zip chromium_src-8d128d6b9ef0096c874fafb9f80cbb5a03c98f4c.tar.gz chromium_src-8d128d6b9ef0096c874fafb9f80cbb5a03c98f4c.tar.bz2 |
Annotate all of the functions in content that need to be exported, in preparation for creating a content shared library.
R=darin@chromium.org, jam@chromium.org, willchan@chromium.org
BUG=90442
TEST=everything still compiles
Review URL: http://codereview.chromium.org/7800015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/speech')
-rw-r--r-- | content/browser/speech/speech_input_manager.h | 5 | ||||
-rw-r--r-- | content/browser/speech/speech_recognizer.h | 21 |
2 files changed, 14 insertions, 12 deletions
diff --git a/content/browser/speech/speech_input_manager.h b/content/browser/speech/speech_input_manager.h index dbfcf1f..a68e790 100644 --- a/content/browser/speech/speech_input_manager.h +++ b/content/browser/speech/speech_input_manager.h @@ -6,6 +6,7 @@ #define CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_ #include "base/basictypes.h" +#include "content/common/content_export.h" #include "content/common/speech_input_result.h" #include "ui/gfx/rect.h" @@ -30,13 +31,13 @@ class SpeechInputManager { virtual ~Delegate() {} }; - SpeechInputManager(); + CONTENT_EXPORT SpeechInputManager(); // Invokes the platform provided microphone settings UI in a non-blocking way, // via the BrowserThread::FILE thread. static void ShowAudioInputSettings(); - virtual ~SpeechInputManager(); + CONTENT_EXPORT virtual ~SpeechInputManager(); // Handlers for requests from render views. diff --git a/content/browser/speech/speech_recognizer.h b/content/browser/speech/speech_recognizer.h index 264194d..f109e92 100644 --- a/content/browser/speech/speech_recognizer.h +++ b/content/browser/speech/speech_recognizer.h @@ -14,6 +14,7 @@ #include "content/browser/speech/audio_encoder.h" #include "content/browser/speech/endpointer/endpointer.h" #include "content/browser/speech/speech_recognition_request.h" +#include "content/common/content_export.h" #include "media/audio/audio_input_controller.h" namespace speech_input { @@ -78,27 +79,27 @@ class SpeechRecognizer virtual ~Delegate() {} }; - SpeechRecognizer(Delegate* delegate, - int caller_id, - const std::string& language, - const std::string& grammar, - bool censor_results, - const std::string& hardware_info, - const std::string& origin_url); + CONTENT_EXPORT SpeechRecognizer(Delegate* delegate, + int caller_id, + const std::string& language, + const std::string& grammar, + bool censor_results, + const std::string& hardware_info, + const std::string& origin_url); virtual ~SpeechRecognizer(); // Starts audio recording and does recognition after recording ends. The same // SpeechRecognizer instance can be used multiple times for speech recognition // though each recognition request can be made only after the previous one // completes (i.e. after receiving Delegate::DidCompleteRecognition). - bool StartRecording(); + CONTENT_EXPORT bool StartRecording(); // Stops recording audio and starts recognition. - void StopRecording(); + CONTENT_EXPORT void StopRecording(); // Stops recording audio and cancels recognition. Any audio recorded so far // gets discarded. - void CancelRecognition(); + CONTENT_EXPORT void CancelRecognition(); // AudioInputController::EventHandler methods. virtual void OnCreated(media::AudioInputController* controller) { } |