mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Update to Chrome 47 version of tts_win

Browse source
This commit is contained in:
Paul Betts 2015-12-07 14:23:01 -08:00
parent 3931ebb7ef
commit 8d5c153e9b
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
chromium_src/chrome/browser/speech/tts_win.cc
View file

@ -15,26 +15,26 @@
class TtsPlatformImplWin : public TtsPlatformImpl { class TtsPlatformImplWin : public TtsPlatformImpl {
public: public:
virtual bool PlatformImplAvailable() { bool PlatformImplAvailable() override {
return true; return true;
} }
virtual bool Speak( bool Speak(
int utterance_id, int utterance_id,
const std::string& utterance, const std::string& utterance,
const std::string& lang, const std::string& lang,
const VoiceData& voice, const VoiceData& voice,
const UtteranceContinuousParameters& params); const UtteranceContinuousParameters& params) override;
virtual bool StopSpeaking(); bool StopSpeaking() override;
virtual void Pause(); void Pause() override;
virtual void Resume(); void Resume() override;
virtual bool IsSpeaking(); bool IsSpeaking() override;
virtual void GetVoices(std::vector<VoiceData>* out_voices) override; void GetVoices(std::vector<VoiceData>* out_voices) override;
// Get the single instance of this class. // Get the single instance of this class.
static TtsPlatformImplWin* GetInstance(); static TtsPlatformImplWin* GetInstance();
@ -43,7 +43,7 @@ class TtsPlatformImplWin : public TtsPlatformImpl {
private: private:
TtsPlatformImplWin(); TtsPlatformImplWin();
virtual ~TtsPlatformImplWin() {} ~TtsPlatformImplWin() override {}
void OnSpeechEvent(); void OnSpeechEvent();
@ -220,6 +220,8 @@ void TtsPlatformImplWin::OnSpeechEvent() {
utterance_id_, TTS_EVENT_SENTENCE, char_position_, utterance_id_, TTS_EVENT_SENTENCE, char_position_,
std::string()); std::string());
break; break;
default:
break;
} }
} }
} }
@ -246,8 +248,8 @@ TtsPlatformImplWin::TtsPlatformImplWin()
// static // static
TtsPlatformImplWin* TtsPlatformImplWin::GetInstance() { TtsPlatformImplWin* TtsPlatformImplWin::GetInstance() {
return base::Singleton< TtsPlatformImplWin, return base::Singleton<TtsPlatformImplWin,
base::LeakySingletonTraits<TtsPlatformImplWin> >::get(); base::LeakySingletonTraits<TtsPlatformImplWin>>::get();
} }
// static // static