| 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 9966755d07db3e8aa3612060925a8829c2b03ed6..98dfc63463f71909cacd151657cf9b79c64e8c0e 100644
|
| --- a/chrome/browser/extensions/external_provider_impl.cc
|
| +++ b/chrome/browser/extensions/external_provider_impl.cc
|
| @@ -80,7 +80,8 @@ ExternalProviderImpl::ExternalProviderImpl(
|
| loader_(loader),
|
| profile_(profile),
|
| creation_flags_(creation_flags),
|
| - auto_acknowledge_(false) {
|
| + auto_acknowledge_(false),
|
| + install_immediately_(false) {
|
| loader_->Init(this);
|
| }
|
|
|
| @@ -271,7 +272,8 @@ void ExternalProviderImpl::SetPrefs(base::DictionaryValue* prefs) {
|
| }
|
| service_->OnExternalExtensionFileFound(extension_id, &version, path,
|
| crx_location_, creation_flags,
|
| - auto_acknowledge_);
|
| + auto_acknowledge_,
|
| + install_immediately_);
|
| } else { // if (has_external_update_url)
|
| CHECK(has_external_update_url); // Checking of keys above ensures this.
|
| if (download_location_ == Manifest::INVALID_LOCATION) {
|
| @@ -423,13 +425,15 @@ void ExternalProviderImpl::CreateExternalProviders(
|
| chromeos::KioskAppManager::Get();
|
| DCHECK(kiosk_app_manager);
|
| if (kiosk_app_manager && !kiosk_app_manager->external_loader_created()) {
|
| - provider_list->push_back(linked_ptr<ExternalProviderInterface>(
|
| - new ExternalProviderImpl(service,
|
| - kiosk_app_manager->CreateExternalLoader(),
|
| - profile,
|
| - Manifest::EXTERNAL_PREF,
|
| - Manifest::INVALID_LOCATION,
|
| - Extension::NO_FLAGS)));
|
| + scoped_ptr<ExternalProviderImpl> kiosk_app_provider(
|
| + new ExternalProviderImpl(
|
| + service, kiosk_app_manager->CreateExternalLoader(), profile,
|
| + Manifest::EXTERNAL_PREF, Manifest::INVALID_LOCATION,
|
| + Extension::NO_FLAGS));
|
| + kiosk_app_provider->set_auto_acknowledge(true);
|
| + kiosk_app_provider->set_install_immediately(true);
|
| + provider_list->push_back(
|
| + linked_ptr<ExternalProviderInterface>(kiosk_app_provider.release()));
|
| }
|
| #endif
|
| return;
|
|
|