summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-09 21:13:56 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-09 21:13:56 +0000
commitdcffeba929887d9166c784bbef423cd909714406 (patch)
tree6b3b75c772431ee72142935a0e5673e90095edb9
parent6bb353fbdac75eeb604ba2a9dd574d215c76670d (diff)
downloadchromium_src-dcffeba929887d9166c784bbef423cd909714406.zip
chromium_src-dcffeba929887d9166c784bbef423cd909714406.tar.gz
chromium_src-dcffeba929887d9166c784bbef423cd909714406.tar.bz2
Merge 148245 - Chrome OS TTS API should not report it's speaking when it's not.
See bug for details. BUG=138773 TEST=Run TTS Demo app on Chrome OS Review URL: https://chromiumcodereview.appspot.com/10796113 TBR=dmazzoni@chromium.org Review URL: https://chromiumcodereview.appspot.com/10836184 git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@150900 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/speech/extension_api/tts_extension_api_chromeos.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/speech/extension_api/tts_extension_api_chromeos.cc b/chrome/browser/speech/extension_api/tts_extension_api_chromeos.cc
index 08a31d1..64bb4e1 100644
--- a/chrome/browser/speech/extension_api/tts_extension_api_chromeos.cc
+++ b/chrome/browser/speech/extension_api/tts_extension_api_chromeos.cc
@@ -167,7 +167,7 @@ bool ExtensionTtsPlatformImplChromeOs::StopSpeaking() {
bool ExtensionTtsPlatformImplChromeOs::IsSpeaking() {
// Defers to controller's utterance based detection of is speaking.
- return true;
+ return false;
}
bool ExtensionTtsPlatformImplChromeOs::SendsEvent(TtsEventType event_type) {