kiosk: Defer app update until platform matches

chrome/browser/chromeos/app_mode/startup_app_launcher.cc

 // Copyright 2013 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/chromeos/app_mode/startup_app_launcher.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/path_service.h"
@@ skipping 251 matching lines @@
     }
     OnLaunchFailure(KioskAppLaunchError::UNABLE_TO_LAUNCH);
   }
 }
 
 void StartupAppLauncher::MaybeCheckExtensionUpdate() {
   extensions::ExtensionUpdater* updater =
       extensions::ExtensionSystem::Get(profile_)
           ->extension_service()
           ->updater();
-  if (!delegate_->IsNetworkReady() || !updater) {
+  if (!delegate_->IsNetworkReady() || !updater ||
+      PrimaryAppHasPendingUpdate()) {
     MaybeLaunchApp();
     return;
   }
 
   extension_update_found_ = false;
   registrar_.Add(this, extensions::NOTIFICATION_EXTENSION_UPDATE_FOUND,
                  content::NotificationService::AllSources());
 
   // Enforce an immediate version update check for all extensions before
   // launching the primary app. After the chromeos is updated, the shared
@@ skipping 115 matching lines @@
   }
   return true;
 }
 
 bool StartupAppLauncher::HasSecondaryApps() const {
   const extensions::Extension* extension = GetPrimaryAppExtension();
   DCHECK(extension);
   return extensions::KioskModeInfo::HasSecondaryApps(extension);
 }
 
+bool StartupAppLauncher::PrimaryAppHasPendingUpdate() const {
+  return !!extensions::ExtensionSystem::Get(profile_)
+               ->extension_service()
+               ->GetPendingExtensionUpdate(app_id_);
+}
+
 bool StartupAppLauncher::DidPrimaryOrSecondaryAppFailedToInstall(
     bool success,
     const std::string& id) const {
   if (success)
     return false;
 
   if (id == app_id_) {
     LOG(ERROR) << "Failed to install crx file of the primary app id=" << id;
     return true;
   }
@@ skipping 111 matching lines @@
   if (AreSecondaryAppsInstalled()) {
     // Check extension update before launching the primary kiosk app.
     MaybeCheckExtensionUpdate();
   } else {
     OnLaunchFailure(KioskAppLaunchError::UNABLE_TO_INSTALL);
   }
 }
 
 void StartupAppLauncher::OnReadyToLaunch() {
   ready_to_launch_ = true;
-  UpdateAppData();
+  MaybeUpdateAppData();
   delegate_->OnReadyToLaunch();
 }
 
-void StartupAppLauncher::UpdateAppData() {
+void StartupAppLauncher::MaybeUpdateAppData() {
+  // Skip copying meta data from the current installed primary app when
+  // there is a pending update.
+  if (PrimaryAppHasPendingUpdate())
+    return;
+
   KioskAppManager::Get()->ClearAppData(app_id_);
   KioskAppManager::Get()->UpdateAppDataFromProfile(app_id_, profile_, NULL);
 }
 
 }   // namespace chromeos