Implement kiosk multiple apps feature.

chrome/browser/extensions/external_provider_impl.cc

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..9078c1da7299b30f450205ea799a4b0089c4fe50 100644
--- a/chrome/browser/extensions/external_provider_impl.cc
+++ b/chrome/browser/extensions/external_provider_impl.cc
@@ -492,6 +492,8 @@ void ExternalProviderImpl::CreateExternalProviders(
     chromeos::KioskAppManager* kiosk_app_manager =
         chromeos::KioskAppManager::Get();
     DCHECK(kiosk_app_manager);

[not at google - send to devlin, 2015/08/26 17:53:58]

When will this be null? It's a pain to DCHECK it here then "if
(kiosk_app_manager)" check it everywhere below. It'd be nice to have this be a
CHECK then don't check |kiosk_app_manager| all the time.

[jennyz, 2015/08/28 18:24:08]

Done.

+
+    // Kiosk primary app external provider.
     if (kiosk_app_manager && !kiosk_app_manager->external_loader_created()) {
       scoped_ptr<ExternalProviderImpl> kiosk_app_provider(
           new ExternalProviderImpl(
@@ -503,6 +505,20 @@ void ExternalProviderImpl::CreateExternalProviders(
       provider_list->push_back(
           linked_ptr<ExternalProviderInterface>(kiosk_app_provider.release()));
     }
+
+    // Kiosk secondary app external provider.
+    if (kiosk_app_manager &&
+        !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;
   }