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

Unified Diff: chrome/browser/speech/tts_chromeos.cc

Issue 361363003: Support onvoiceschanged for extension-based tts engines. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Clang Created 6 years, 5 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
Index: chrome/browser/speech/tts_chromeos.cc
diff --git a/chrome/browser/speech/tts_chromeos.cc b/chrome/browser/speech/tts_chromeos.cc
index e42cb0c546b4642050ddd73fc9df48d3ef7dd4fd..ad52238e313c2a67966541ac1fe668b53834c685 100644
--- a/chrome/browser/speech/tts_chromeos.cc
+++ b/chrome/browser/speech/tts_chromeos.cc
@@ -2,8 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/speech/tts_extension_loader_chromeos.h"
+#include "chrome/browser/extensions/component_loader.h"
+#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/speech/extension_api/tts_engine_extension_observer.h"
#include "chrome/browser/speech/tts_platform.h"
+#include "chrome/common/extensions/extension_constants.h"
+#include "extensions/browser/extension_system.h"
// Chrome OS doesn't have native TTS, instead it includes a built-in
// component extension that provides speech synthesis. This class includes
@@ -18,7 +23,19 @@ class TtsPlatformImplChromeOs
}
virtual bool LoadBuiltInTtsExtension(Profile* profile) OVERRIDE {
- return TtsExtensionLoaderChromeOs::GetInstance(profile)->LoadTtsExtension();
+ // Check to see if the engine was previously loaded.
+ if (TtsEngineExtensionObserver::GetInstance(profile)->SawExtensionLoad(
+ extension_misc::kSpeechSynthesisExtensionId, true)) {
+ return false;
+ }
+
+ // Load the component extension into this profile.
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
+ DCHECK(extension_service);
+ extension_service->component_loader()
+ ->AddChromeOsSpeechSynthesisExtension();
+ return true;
}
virtual bool Speak(
« no previous file with comments | « chrome/browser/speech/extension_api/tts_extension_api.cc ('k') | chrome/browser/speech/tts_extension_loader_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698