scoped_ptr.PassAs is removed
This commit is contained in:
parent
43421aedcf
commit
5c78ecfe40
21 changed files with 84 additions and 85 deletions
|
@ -29,26 +29,26 @@ class TtsControllerImpl : public TtsController {
|
|||
static TtsControllerImpl* GetInstance();
|
||||
|
||||
// TtsController methods
|
||||
virtual bool IsSpeaking() OVERRIDE;
|
||||
virtual void SpeakOrEnqueue(Utterance* utterance) OVERRIDE;
|
||||
virtual void Stop() OVERRIDE;
|
||||
virtual void Pause() OVERRIDE;
|
||||
virtual void Resume() OVERRIDE;
|
||||
virtual bool IsSpeaking() override;
|
||||
virtual void SpeakOrEnqueue(Utterance* utterance) override;
|
||||
virtual void Stop() override;
|
||||
virtual void Pause() override;
|
||||
virtual void Resume() override;
|
||||
virtual void OnTtsEvent(int utterance_id,
|
||||
TtsEventType event_type,
|
||||
int char_index,
|
||||
const std::string& error_message) OVERRIDE;
|
||||
const std::string& error_message) override;
|
||||
virtual void GetVoices(content::BrowserContext* browser_context,
|
||||
std::vector<VoiceData>* out_voices) OVERRIDE;
|
||||
virtual void VoicesChanged() OVERRIDE;
|
||||
std::vector<VoiceData>* out_voices) override;
|
||||
virtual void VoicesChanged() override;
|
||||
virtual void AddVoicesChangedDelegate(
|
||||
VoicesChangedDelegate* delegate) OVERRIDE;
|
||||
VoicesChangedDelegate* delegate) override;
|
||||
virtual void RemoveVoicesChangedDelegate(
|
||||
VoicesChangedDelegate* delegate) OVERRIDE;
|
||||
virtual void SetTtsEngineDelegate(TtsEngineDelegate* delegate) OVERRIDE;
|
||||
virtual TtsEngineDelegate* GetTtsEngineDelegate() OVERRIDE;
|
||||
virtual void SetPlatformImpl(TtsPlatformImpl* platform_impl) OVERRIDE;
|
||||
virtual int QueueSize() OVERRIDE;
|
||||
VoicesChangedDelegate* delegate) override;
|
||||
virtual void SetTtsEngineDelegate(TtsEngineDelegate* delegate) override;
|
||||
virtual TtsEngineDelegate* GetTtsEngineDelegate() override;
|
||||
virtual void SetPlatformImpl(TtsPlatformImpl* platform_impl) override;
|
||||
virtual int QueueSize() override;
|
||||
|
||||
protected:
|
||||
TtsControllerImpl();
|
||||
|
|
|
@ -32,18 +32,18 @@ struct SPDChromeVoice {
|
|||
|
||||
class TtsPlatformImplLinux : public TtsPlatformImpl {
|
||||
public:
|
||||
virtual bool PlatformImplAvailable() OVERRIDE;
|
||||
virtual bool PlatformImplAvailable() override;
|
||||
virtual bool Speak(
|
||||
int utterance_id,
|
||||
const std::string& utterance,
|
||||
const std::string& lang,
|
||||
const VoiceData& voice,
|
||||
const UtteranceContinuousParameters& params) OVERRIDE;
|
||||
virtual bool StopSpeaking() OVERRIDE;
|
||||
virtual void Pause() OVERRIDE;
|
||||
virtual void Resume() OVERRIDE;
|
||||
virtual bool IsSpeaking() OVERRIDE;
|
||||
virtual void GetVoices(std::vector<VoiceData>* out_voices) OVERRIDE;
|
||||
const UtteranceContinuousParameters& params) override;
|
||||
virtual bool StopSpeaking() override;
|
||||
virtual void Pause() override;
|
||||
virtual void Resume() override;
|
||||
virtual bool IsSpeaking() override;
|
||||
virtual void GetVoices(std::vector<VoiceData>* out_voices) override;
|
||||
|
||||
void OnSpeechEvent(SPDNotificationType type);
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ class TtsPlatformImplMac;
|
|||
|
||||
class TtsPlatformImplMac : public TtsPlatformImpl {
|
||||
public:
|
||||
virtual bool PlatformImplAvailable() OVERRIDE {
|
||||
virtual bool PlatformImplAvailable() override {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -58,17 +58,17 @@ class TtsPlatformImplMac : public TtsPlatformImpl {
|
|||
const std::string& utterance,
|
||||
const std::string& lang,
|
||||
const VoiceData& voice,
|
||||
const UtteranceContinuousParameters& params) OVERRIDE;
|
||||
const UtteranceContinuousParameters& params) override;
|
||||
|
||||
virtual bool StopSpeaking() OVERRIDE;
|
||||
virtual bool StopSpeaking() override;
|
||||
|
||||
virtual void Pause() OVERRIDE;
|
||||
virtual void Pause() override;
|
||||
|
||||
virtual void Resume() OVERRIDE;
|
||||
virtual void Resume() override;
|
||||
|
||||
virtual bool IsSpeaking() OVERRIDE;
|
||||
virtual bool IsSpeaking() override;
|
||||
|
||||
virtual void GetVoices(std::vector<VoiceData>* out_voices) OVERRIDE;
|
||||
virtual void GetVoices(std::vector<VoiceData>* out_voices) override;
|
||||
|
||||
// Called by ChromeTtsDelegate when we get a callback from the
|
||||
// native speech engine.
|
||||
|
|
|
@ -34,7 +34,7 @@ class TtsPlatformImplWin : public TtsPlatformImpl {
|
|||
|
||||
virtual bool IsSpeaking();
|
||||
|
||||
virtual void GetVoices(std::vector<VoiceData>* out_voices) OVERRIDE;
|
||||
virtual void GetVoices(std::vector<VoiceData>* out_voices) override;
|
||||
|
||||
// Get the single instance of this class.
|
||||
static TtsPlatformImplWin* GetInstance();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue