| 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 9c74cca1f7fccc9068a5f2f0be5e7b7b25aae399..c2a41b95cdf792a5b079fa14138696b727c9bff3 100644
|
| --- a/chrome/browser/extensions/external_provider_impl.cc
|
| +++ b/chrome/browser/extensions/external_provider_impl.cc
|
| @@ -483,7 +483,8 @@ void ExternalProviderImpl::CreateExternalProviders(
|
| service,
|
| new ExternalPrefLoader(
|
| chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS,
|
| - ExternalPrefLoader::NONE),
|
| + ExternalPrefLoader::NONE,
|
| + NULL),
|
| profile,
|
| Manifest::EXTERNAL_PREF,
|
| Manifest::EXTERNAL_PREF_DOWNLOAD,
|
| @@ -496,11 +497,15 @@ void ExternalProviderImpl::CreateExternalProviders(
|
| int external_apps_path_id = profile->IsSupervised() ?
|
| chrome::DIR_SUPERVISED_USERS_DEFAULT_APPS :
|
| chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS;
|
| + ExternalPrefLoader::Options pref_load_flags = profile->IsNewProfile() ?
|
| + ExternalPrefLoader::DELAY_LOAD_UNTIL_PRIORITY_SYNC :
|
| + ExternalPrefLoader::NONE;
|
| provider_list->push_back(
|
| linked_ptr<ExternalProviderInterface>(new ExternalProviderImpl(
|
| service,
|
| new ExternalPrefLoader(external_apps_path_id,
|
| - ExternalPrefLoader::NONE),
|
| + pref_load_flags,
|
| + profile),
|
| profile,
|
| Manifest::EXTERNAL_PREF,
|
| Manifest::EXTERNAL_PREF_DOWNLOAD,
|
| @@ -542,7 +547,8 @@ void ExternalProviderImpl::CreateExternalProviders(
|
| new ExternalProviderImpl(
|
| service,
|
| new ExternalPrefLoader(chrome::DIR_EXTERNAL_EXTENSIONS,
|
| - check_admin_permissions_on_mac),
|
| + check_admin_permissions_on_mac,
|
| + NULL),
|
| profile,
|
| Manifest::EXTERNAL_PREF,
|
| Manifest::EXTERNAL_PREF_DOWNLOAD,
|
| @@ -556,7 +562,8 @@ void ExternalProviderImpl::CreateExternalProviders(
|
| new ExternalProviderImpl(
|
| service,
|
| new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS,
|
| - ExternalPrefLoader::NONE),
|
| + ExternalPrefLoader::NONE,
|
| + NULL),
|
| profile,
|
| Manifest::EXTERNAL_PREF,
|
| Manifest::EXTERNAL_PREF_DOWNLOAD,
|
| @@ -584,7 +591,8 @@ void ExternalProviderImpl::CreateExternalProviders(
|
| profile,
|
| service,
|
| new ExternalPrefLoader(chrome::DIR_DEFAULT_APPS,
|
| - ExternalPrefLoader::NONE),
|
| + ExternalPrefLoader::NONE,
|
| + NULL),
|
| Manifest::INTERNAL,
|
| Manifest::INTERNAL,
|
| Extension::FROM_WEBSTORE |
|
|
|