diff options
Diffstat (limited to 'chrome/browser/extensions/external_extension_provider_impl.cc')
| -rw-r--r-- | chrome/browser/extensions/external_extension_provider_impl.cc | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/chrome/browser/extensions/external_extension_provider_impl.cc b/chrome/browser/extensions/external_extension_provider_impl.cc index 68ffa0b..d9f332e 100644 --- a/chrome/browser/extensions/external_extension_provider_impl.cc +++ b/chrome/browser/extensions/external_extension_provider_impl.cc @@ -317,9 +317,23 @@ void ExternalExtensionProviderImpl::CreateExternalProviders( Extension::EXTERNAL_PREF_DOWNLOAD, Extension::NO_FLAGS))); -#if defined(OS_CHROMEOS) || defined (OS_MACOSX) +#if defined(OS_CHROMEOS) + // Define a per-user source of external default extensions, which serves + // as a source for OEM customization. Mark these default extensions as + // being from the webstore so they can load Native Client modules. + provider_list->push_back( + linked_ptr<ExternalExtensionProviderInterface>( + new ExternalExtensionProviderImpl( + service, + new ExternalPrefExtensionLoader( + chrome::DIR_USER_EXTERNAL_EXTENSIONS, + ExternalPrefExtensionLoader::NONE), + Extension::EXTERNAL_PREF, + Extension::EXTERNAL_PREF_DOWNLOAD, + Extension::FROM_WEBSTORE))); +#endif +#if defined (OS_MACOSX) // Define a per-user source of external extensions. - // On Chrome OS, this serves as a source for OEM customization. provider_list->push_back( linked_ptr<ExternalExtensionProviderInterface>( new ExternalExtensionProviderImpl( |