Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4967)

Unified Diff: chrome/browser/extensions/external_provider_impl.cc

Issue 974713002: kiosk: Ensure launching latest version. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unittest compile Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;
« no previous file with comments | « chrome/browser/extensions/external_provider_impl.h ('k') | extensions/browser/external_provider_interface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698