kiosk: Ensure launching latest version.

chrome/browser/extensions/external_provider_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/external_provider_impl.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 62 matching lines @@
     Manifest::Location crx_location,
     Manifest::Location download_location,
     int creation_flags)
     : crx_location_(crx_location),
       download_location_(download_location),
       service_(service),
       ready_(false),
       loader_(loader),
       profile_(profile),
       creation_flags_(creation_flags),
-      auto_acknowledge_(false) {
+      auto_acknowledge_(false),
+      install_immediately_(false) {
   loader_->Init(this);
 }
 
 ExternalProviderImpl::~ExternalProviderImpl() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   loader_->OwnerShutdown();
 }
 
 void ExternalProviderImpl::VisitRegisteredExtension() {
   // The loader will call back to SetPrefs.
@@ skipping 170 matching lines @@
 
       Version version(external_version);
       if (!version.IsValid()) {
         LOG(WARNING) << "Malformed extension dictionary for extension: "
                      << extension_id.c_str() << ".  Invalid version string \""
                      << external_version << "\".";
         continue;
       }
       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) {
         LOG(WARNING) << "This provider does not support installing external "
                      << "extensions from update URLs.";
         continue;
       }
       GURL update_url(external_update_url);
       if (!update_url.is_valid()) {
         LOG(WARNING) << "Malformed extension dictionary for extension: "
@@ skipping 131 matching lines @@
                 Extension::NO_FLAGS)));
   }
 
   // Load the KioskAppExternalProvider when running in kiosk mode.
   if (chrome::IsRunningInForcedAppMode()) {
 #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()) {
-      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;
   }
 
   // Extensions provided by recommended policies.
   if (external_recommended_loader.get()) {
     provider_list->push_back(linked_ptr<ExternalProviderInterface>(
         new ExternalProviderImpl(service,
                                  external_recommended_loader,
@@ skipping 134 matching lines @@
             service,
             new ExternalComponentLoader(profile),
             profile,
             Manifest::INVALID_LOCATION,
             Manifest::EXTERNAL_COMPONENT,
             Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT)));
   }
 }
 
 }  // namespace extensions