Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2436)

Unified Diff: chrome/browser/speech/tts_controller.h

Issue 149233004: Revert "Automatically trigger installation of high-quality speech synthesis extension." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Don't remove WillSpeakUtteranceWithVoice, it is dependent upon by a test now. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/speech/tts_chromeos.cc ('k') | chrome/browser/speech/tts_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/speech/tts_controller.h
diff --git a/chrome/browser/speech/tts_controller.h b/chrome/browser/speech/tts_controller.h
index c4329e4d9741712f23111cd3f18738f3c454059d..c8d1c10a4cf456421169892bce4b179ce896a20a 100644
--- a/chrome/browser/speech/tts_controller.h
+++ b/chrome/browser/speech/tts_controller.h
@@ -102,7 +102,7 @@ class Utterance {
// when the utterance is done speaking. Before speaking this utterance,
// its other parameters like text, rate, pitch, etc. should all be set.
explicit Utterance(Profile* profile);
- virtual ~Utterance();
+ ~Utterance();
// Sends an event to the delegate. If the event type is TTS_EVENT_END
// or TTS_EVENT_ERROR, deletes the utterance. If |char_index| is -1,
@@ -189,9 +189,6 @@ class Utterance {
int id() const { return id_; }
bool finished() const { return finished_; }
- protected:
- void set_finished_for_testing(bool finished) { finished_ = finished; }
-
private:
// The profile that initiated this utterance.
Profile* profile_;
@@ -286,6 +283,10 @@ class TtsController {
// if supported, and all voices registered by extensions.
void GetVoices(Profile* profile, std::vector<VoiceData>* out_voices);
+ // Called by TtsExtensionLoaderChromeOs::LoadTtsExtension when it
+ // finishes loading the built-in TTS component extension.
+ void RetrySpeakingQueuedUtterances();
+
// Called by the extension system or platform implementation when the
// list of voices may have changed and should be re-queried.
void VoicesChanged();
« no previous file with comments | « chrome/browser/speech/tts_chromeos.cc ('k') | chrome/browser/speech/tts_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698