| Index: chrome/browser/speech/extension_api/tts_engine_extension_api.cc
|
| diff --git a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
|
| index c7f514a1d1a51137d8f736d5cccb20ed4f487c9b..5f06106a88b9557785abd887195aa221ba34b4a9 100644
|
| --- a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
|
| +++ b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
|
| @@ -8,11 +8,15 @@
|
|
|
| #include "base/json/json_writer.h"
|
| #include "base/values.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/extension_api/tts_extension_api.h"
|
| #include "chrome/browser/speech/extension_api/tts_extension_api_constants.h"
|
| #include "chrome/browser/speech/tts_controller.h"
|
| #include "chrome/common/extensions/api/speech/tts_engine_manifest_handler.h"
|
| +#include "chrome/common/extensions/extension_constants.h"
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/common/console_message_level.h"
|
| @@ -210,6 +214,26 @@ void TtsExtensionEngine::Resume(Utterance* utterance) {
|
| WarnIfMissingPauseOrResumeListener(profile, event_router, id);
|
| }
|
|
|
| +bool TtsExtensionEngine::LoadBuiltInTtsExtension(Profile* profile) {
|
| +#if defined(OS_CHROMEOS)
|
| + // 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;
|
| +#else
|
| + return false;
|
| +#endif
|
| +}
|
| +
|
| bool ExtensionTtsEngineSendTtsEventFunction::RunSync() {
|
| int utterance_id;
|
| EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &utterance_id));
|
|
|