When restoring kiosk app after crash, skip app installation steps

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/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 78 matching lines @@
       ->RemoveObserver(this);
   extensions::InstallTrackerFactory::GetForBrowserContext(profile_)
       ->RemoveObserver(this);
 }
 
 void StartupAppLauncher::Initialize() {
   StartLoadingOAuthFile();
 }
 
 void StartupAppLauncher::ContinueWithNetworkReady() {
-  if (!network_ready_handled_) {
-    network_ready_handled_ = true;
-    // The network might not be ready when KioskAppManager tries to update
-    // external cache initially. Update the external cache now that the network
-    // is ready for sure.
-    wait_for_crx_update_ = true;
-    KioskAppManager::Get()->UpdateExternalCache();
+  if (network_ready_handled_)
+    return;
+
+  network_ready_handled_ = true;
+
+  if (!delegate_->ShouldUpdateCacheOnNetworkReady()) {
+    BeginInstall();

[xiyuan, 2017/01/30 23:13:06]

Should we skip all installation stuff and jump to MaybeLaunchApp ?

[tbarzic, 2017/01/30 23:45:21]

I'm slightly concerned that in certain situations we might end up in
MaybeLaunchApp without the kiosk app being locally available (e.g. if there is a
crash during initial app installation) - though, in those cases it might be
reasonable to just cancel the launch instead of showing a black screen while the
app is downloaded...

[xiyuan, 2017/01/30 23:49:44]

Good point. BeginInstall() it is then.

[tbarzic, 2017/01/30 23:55:02]

Actually, we should only end up in that state if the crash happens before app
launch in original session - in that case it might be better to cancel the app
launch all together (as the newest patch does :) ), wdyt?

[xiyuan, 2017/01/30 23:59:48]

SG.

+    return;
   }
+
+  // The network might not be ready when KioskAppManager tries to update
+  // external cache initially. Update the external cache now that the network
+  // is ready for sure.
+  wait_for_crx_update_ = true;
+  KioskAppManager::Get()->UpdateExternalCache();
 }
 
 void StartupAppLauncher::StartLoadingOAuthFile() {
   delegate_->OnLoadingOAuthFile();
 
   KioskOAuthParams* auth_params = new KioskOAuthParams();
   BrowserThread::PostBlockingPoolTaskAndReply(
       FROM_HERE,
       base::Bind(&StartupAppLauncher::LoadOAuthFileOnBlockingPool,
                  auth_params),
@@ skipping 147 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() ||
+      !delegate_->ShouldUpdateCacheOnNetworkReady() || !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
@@ skipping 272 matching lines @@
   // 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