diff options
| author | tbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 23:00:30 +0000 |
|---|---|---|
| committer | tbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 23:00:30 +0000 |
| commit | d69cc7809008f7ea75cac1396f3c703b6743399a (patch) | |
| tree | c0525330bfe0361dca4af52821a346800fc680e1 | |
| parent | a8733d06d331d63a12f291ac49f3390a5edf15d9 (diff) | |
| download | chromium_src-d69cc7809008f7ea75cac1396f3c703b6743399a.zip chromium_src-d69cc7809008f7ea75cac1396f3c703b6743399a.tar.gz chromium_src-d69cc7809008f7ea75cac1396f3c703b6743399a.tar.bz2 | |
Merge 134761 - Mark default apps on ChromeOS installed from DIR_EXTERNAL_EXTENSIONS "from webstore"
The default extensions should be able to load NaCl modules.
This is a problem now because they aren't really distinguishable from normal extensions. To fix
this, mark them as "from webstore" when they're loaded.
Also, revert crrev.com/130235 as that didn't work
BUG=chromium-os:28707
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10269031
TBR=tbarzic@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10289004
git-svn-id: svn://svn.chromium.org/chrome/branches/1084/src@134811 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/external_extension_provider_impl.cc | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/chrome/browser/extensions/external_extension_provider_impl.cc b/chrome/browser/extensions/external_extension_provider_impl.cc index 67489d1..846f906 100644 --- a/chrome/browser/extensions/external_extension_provider_impl.cc +++ b/chrome/browser/extensions/external_extension_provider_impl.cc @@ -315,7 +315,11 @@ void ExternalExtensionProviderImpl::CreateExternalProviders( check_admin_permissions_on_mac), Extension::EXTERNAL_PREF, Extension::EXTERNAL_PREF_DOWNLOAD, +#if defined(OS_CHROMEOS) + Extension::FROM_WEBSTORE))); +#else Extension::NO_FLAGS))); +#endif #if defined(OS_MACOSX) // Support old path to external extensions file as we migrate to the @@ -331,23 +335,10 @@ void ExternalExtensionProviderImpl::CreateExternalProviders( Extension::EXTERNAL_PREF_DOWNLOAD, Extension::NO_FLAGS))); #endif -#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) + +#if defined(OS_CHROMEOS) || 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( |