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

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

Issue 1301323005: Implement kiosk multiple apps feature. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nits. Created 5 years, 4 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 7844bca135e6f2f5010e100d8bf1aab0e5fec90c..4a29cdb3eff61064fdad27091050998df367c214 100644
--- a/chrome/browser/extensions/external_provider_impl.cc
+++ b/chrome/browser/extensions/external_provider_impl.cc
@@ -491,8 +491,10 @@ void ExternalProviderImpl::CreateExternalProviders(
#if defined(OS_CHROMEOS)
chromeos::KioskAppManager* kiosk_app_manager =
chromeos::KioskAppManager::Get();
- DCHECK(kiosk_app_manager);
- if (kiosk_app_manager && !kiosk_app_manager->external_loader_created()) {
+ CHECK(kiosk_app_manager);
+
+ // Kiosk primary app external provider.
+ if (!kiosk_app_manager->external_loader_created()) {
scoped_ptr<ExternalProviderImpl> kiosk_app_provider(
new ExternalProviderImpl(
service, kiosk_app_manager->CreateExternalLoader(), profile,
@@ -503,6 +505,19 @@ void ExternalProviderImpl::CreateExternalProviders(
provider_list->push_back(
linked_ptr<ExternalProviderInterface>(kiosk_app_provider.release()));
}
+
+ // Kiosk secondary app external provider.
+ if (!kiosk_app_manager->secondary_app_external_loader_created()) {
+ scoped_ptr<ExternalProviderImpl> secondary_kiosk_app_provider(
+ new ExternalProviderImpl(
+ service, kiosk_app_manager->CreateSecondaryAppExternalLoader(),
+ profile, Manifest::EXTERNAL_PREF,
+ Manifest::EXTERNAL_PREF_DOWNLOAD, Extension::NO_FLAGS));
+ secondary_kiosk_app_provider->set_auto_acknowledge(true);
+ secondary_kiosk_app_provider->set_install_immediately(true);
+ provider_list->push_back(linked_ptr<ExternalProviderInterface>(
+ secondary_kiosk_app_provider.release()));
+ }
#endif
return;
}

Powered by Google App Engine
This is Rietveld 408576698