Restore auto-launched state on kiosk restart within session

chrome/browser/chromeos/login/session/user_session_manager.cc

 // Copyright 2014 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/login/session/user_session_manager.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <string>
@@ skipping 563 matching lines @@
 }
 
 void UserSessionManager::InitNonKioskExtensionFeaturesSessionType(
     const user_manager::User* user) {
   // Kiosk session should be set as part of kiosk user session initialization
   // in normal circumstances (to be able to properly determine whether kiosk
   // was auto-launched); in case of user session restore, feature session
   // type has be set before kiosk app controller takes over, as at that point
   // kiosk app profile would already be initialized - feature session type
   // should be set before that.
-  // TODO(tbarzic): Note that this does not work well for auto-launched
-  //     sessions, as information about whether session was auto-launched is not
-  //     persisted over session restart - http://crbug.com/677340.
   if (user->GetType() == user_manager::USER_TYPE_KIOSK_APP) {
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kLoginUser)) {
+      // For kiosk session crash recovery, feature session type has be set
+      // before kiosk app controller takes over, as at that point iosk app
+      // profile would already be initialized - feature session type
+      // should be set before that.
+      bool auto_launched = base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kAppAutoLaunched);
       extensions::SetCurrentFeatureSessionType(
-          extensions::FeatureSessionType::KIOSK);
+          auto_launched ? extensions::FeatureSessionType::AUTOLAUNCHED_KIOSK
+                        : extensions::FeatureSessionType::KIOSK);
     }
     return;
   }
 
   extensions::SetCurrentFeatureSessionType(
       user->HasGaiaAccount() ? extensions::FeatureSessionType::REGULAR
                              : extensions::FeatureSessionType::UNKNOWN);
 }
 
 void UserSessionManager::SetFirstLoginPrefs(
@@ skipping 1285 matching lines @@
           ->browser_policy_connector_chromeos()
           ->IsEnterpriseManaged()) {
     return false;
   }
 
   // Do not show end of life notification if this is a guest session
   return !profile->IsGuestSession();
 }
 
 }  // namespace chromeos