diff options
author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 16:30:40 +0000 |
---|---|---|
committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 16:30:40 +0000 |
commit | 78c7e2c68da0079869252bb464f4633373e5d067 (patch) | |
tree | ccac74580777fd73492d6d76e4f2e25e4c34683c | |
parent | 69b43dd0abfa9111cd3219d30e7adc25d95bf27b (diff) | |
download | chromium_src-78c7e2c68da0079869252bb464f4633373e5d067.zip chromium_src-78c7e2c68da0079869252bb464f4633373e5d067.tar.gz chromium_src-78c7e2c68da0079869252bb464f4633373e5d067.tar.bz2 |
Revert 49260 - Broke compile - Added InitTts function to speech synthesis library
Review URL: http://codereview.chromium.org/2510001
TBR=chaitanyag@chromium.org
Review URL: http://codereview.chromium.org/2770006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49264 0039d316-1c4b-4281-b951-d872f2087c98
3 files changed, 0 insertions, 11 deletions
diff --git a/chrome/browser/chromeos/cros/mock_speech_synthesis_library.h b/chrome/browser/chromeos/cros/mock_speech_synthesis_library.h index 08cf883..f40b9e7 100644 --- a/chrome/browser/chromeos/cros/mock_speech_synthesis_library.h +++ b/chrome/browser/chromeos/cros/mock_speech_synthesis_library.h @@ -18,7 +18,6 @@ class MockSpeechSynthesisLibrary : public SpeechSynthesisLibrary { MOCK_METHOD1(SetSpeakProperties, bool(const char*)); MOCK_METHOD0(StopSpeaking, bool(void)); MOCK_METHOD0(IsSpeaking, bool(void)); - MOCK_METHOD1(InitTts, void(InitStatusCallback)); }; } // namespace chromeos diff --git a/chrome/browser/chromeos/cros/speech_synthesis_library.cc b/chrome/browser/chromeos/cros/speech_synthesis_library.cc index b70a458..e7478c5 100644 --- a/chrome/browser/chromeos/cros/speech_synthesis_library.cc +++ b/chrome/browser/chromeos/cros/speech_synthesis_library.cc @@ -27,8 +27,4 @@ bool SpeechSynthesisLibraryImpl::IsSpeaking() { return chromeos::IsSpeaking(); } -void SpeechSynthesisLibraryImpl::InitTts(InitStatusCallback callback) { - chromeos::InitTts(callback); -} - } // namespace chromeos diff --git a/chrome/browser/chromeos/cros/speech_synthesis_library.h b/chrome/browser/chromeos/cros/speech_synthesis_library.h index 10f2c11..f042207 100644 --- a/chrome/browser/chromeos/cros/speech_synthesis_library.h +++ b/chrome/browser/chromeos/cros/speech_synthesis_library.h @@ -12,8 +12,6 @@ namespace chromeos { // This interface defines the interaction with the ChromeOS login library APIs. class SpeechSynthesisLibrary { public: - typedef void(*InitStatusCallback)(bool success); - virtual ~SpeechSynthesisLibrary() {} // Speaks the specified text. virtual bool Speak(const char* text) = 0; @@ -23,9 +21,6 @@ class SpeechSynthesisLibrary { virtual bool StopSpeaking() = 0; // Checks if the engine is currently speaking. virtual bool IsSpeaking() = 0; - // Starts the speech synthesis service and indicates through a callback if - // it started successfully. - virtual void InitTts(InitStatusCallback) = 0; }; // This class handles the interaction with the ChromeOS login library APIs. @@ -39,7 +34,6 @@ class SpeechSynthesisLibraryImpl : public SpeechSynthesisLibrary { virtual bool SetSpeakProperties(const char* props); virtual bool StopSpeaking(); virtual bool IsSpeaking(); - virtual void InitTts(InitStatusCallback); private: DISALLOW_COPY_AND_ASSIGN(SpeechSynthesisLibraryImpl); |