Chromium Code Reviews| Index: chrome/browser/extensions/external_provider_impl.cc |
| diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc |
| index 5db54b63d1371e23812cb7f1911751defcac8c22..ce42c4b29b84a38a65034fcee7a5b775e4b1e344 100644 |
| --- a/chrome/browser/extensions/external_provider_impl.cc |
| +++ b/chrome/browser/extensions/external_provider_impl.cc |
| @@ -36,6 +36,7 @@ |
| #if defined(OS_CHROMEOS) |
| #include "chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.h" |
| #include "chrome/browser/chromeos/extensions/external_pref_cache_loader.h" |
| +#include "chrome/browser/chromeos/extensions/speech_synthesis_loader.h" |
| #include "chrome/browser/chromeos/login/user.h" |
| #include "chrome/browser/chromeos/login/user_manager.h" |
| #include "chrome/browser/chromeos/policy/app_pack_updater.h" |
| @@ -458,6 +459,18 @@ void ExternalProviderImpl::CreateExternalProviders( |
| Manifest::INVALID_LOCATION, |
| Extension::NO_FLAGS))); |
| } |
| + |
| + if (!is_chromeos_demo_session) { |
|
not at google - send to devlin
2013/12/09 21:08:09
Could this go in ExternalComponentLoader? It seems
dmazzoni
2013/12/10 07:55:53
SpeechSynthesisLoader is Chrome OS only. Merging i
not at google - send to devlin
2013/12/10 20:37:48
So it's more than just #if defined(OS_CHROMEOS)? I
|
| + provider_list->push_back( |
| + linked_ptr<ExternalProviderInterface>( |
| + new ExternalProviderImpl( |
| + service, |
| + new chromeos::SpeechSynthesisLoader(profile), |
| + profile, |
| + Manifest::EXTERNAL_COMPONENT, |
| + Manifest::EXTERNAL_COMPONENT, |
| + Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT))); |
| + } |
| #endif |
| if (!profile->IsManaged() && !is_chromeos_demo_session) { |