| Index: chrome/browser/extensions/external_policy_loader.cc
|
| diff --git a/chrome/browser/extensions/external_policy_loader.cc b/chrome/browser/extensions/external_policy_loader.cc
|
| index 5297519142efebef28521165b7a2433fb17c1b10..9453f8a031af76fd5549ae9eb8da08fe35101f95 100644
|
| --- a/chrome/browser/extensions/external_policy_loader.cc
|
| +++ b/chrome/browser/extensions/external_policy_loader.cc
|
| @@ -10,8 +10,9 @@
|
|
|
| namespace extensions {
|
|
|
| -ExternalPolicyLoader::ExternalPolicyLoader(ExtensionManagement *settings)
|
| - : settings_(settings) {
|
| +ExternalPolicyLoader::ExternalPolicyLoader(ExtensionManagement* settings,
|
| + InstallationType type)
|
| + : settings_(settings), type_(type) {
|
| settings_->AddObserver(this);
|
| }
|
|
|
| @@ -33,7 +34,7 @@ void ExternalPolicyLoader::AddExtension(base::DictionaryValue* dict,
|
| }
|
|
|
| void ExternalPolicyLoader::StartLoading() {
|
| - prefs_ = settings_->GetForceInstallList();
|
| + prefs_ = settings_->GetAutoInstallList(type_ == FORCED);
|
| LoadFinished();
|
| }
|
|
|
|
|