Updated KioskAppManager to track whether an app was auto-launched.

chrome/browser/chromeos/app_mode/kiosk_app_manager.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/kiosk_app_manager.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 82 matching lines @@
     return;
 
   instance.Pointer()->CleanUp();
 }
 
 // static
 void KioskAppManager::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterDictionaryPref(kKioskDictionaryName);
 }
 
-KioskAppManager::App::App(const KioskAppData& data, bool is_extension_pending)
+KioskAppManager::App::App(
+    const KioskAppData& data, bool is_extension_pending, bool was_auto_launched)
     : app_id(data.app_id()),
       user_id(data.user_id()),
       name(data.name()),
       icon(data.icon()),
-      is_loading(data.IsLoading() || is_extension_pending) {
+      is_loading(data.IsLoading() || is_extension_pending),
+      was_auto_launched(was_auto_launched) {
 }
 
-KioskAppManager::App::App() : is_loading(false) {}
+KioskAppManager::App::App() : is_loading(false), was_auto_launched(false) {}
 KioskAppManager::App::~App() {}
 
 std::string KioskAppManager::GetAutoLaunchApp() const {
   return auto_launch_app_id_;
 }
 
 void KioskAppManager::SetAutoLaunchApp(const std::string& app_id) {
   SetAutoLoginState(AUTOLOGIN_REQUESTED);
   // Clean first, so the proper change callbacks are triggered even
   // if we are only changing AutoLoginState here.
   if (!auto_launch_app_id_.empty()) {
     CrosSettings::Get()->SetString(kAccountsPrefDeviceLocalAccountAutoLoginId,
                                    std::string());
   }
 
   CrosSettings::Get()->SetString(
       kAccountsPrefDeviceLocalAccountAutoLoginId,
       app_id.empty() ? std::string() : GenerateKioskAppAccountId(app_id));
   CrosSettings::Get()->SetInteger(
       kAccountsPrefDeviceLocalAccountAutoLoginDelay, 0);
 }
 
+void KioskAppManager::SetAppWasAutoLaunched(const std::string& app_id) {
+  DCHECK_EQ(app_id, auto_launch_app_id_);

[bartfab (slow), 2015/02/06 12:07:39]

Nit: Expected value first, actual value second.

[Andrew T Wilson (Slow), 2015/02/06 13:24:20]

Done.

+  currently_auto_launched_app_ = app_id;
+}
+
 void KioskAppManager::EnableConsumerKioskAutoLaunch(
     const KioskAppManager::EnableKioskAutoLaunchCallback& callback) {
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   connector->GetInstallAttributes()->LockDevice(
       std::string(),  // user
       policy::DEVICE_MODE_CONSUMER_KIOSK_AUTOLAUNCH,
       std::string(),  // device_id
       base::Bind(
           &KioskAppManager::OnLockDevice, base::Unretained(this), callback));
@@ skipping 160 matching lines @@
   }
 
   policy::SetDeviceLocalAccounts(CrosSettings::Get(), device_local_accounts);
 }
 
 void KioskAppManager::GetApps(Apps* apps) const {
   apps->clear();
   apps->reserve(apps_.size());
   for (size_t i = 0; i < apps_.size(); ++i) {
     const KioskAppData& app_data = *apps_[i];
-    if (app_data.status() != KioskAppData::STATUS_ERROR)
+    if (app_data.status() != KioskAppData::STATUS_ERROR) {
       apps->push_back(App(
-          app_data, external_cache_->IsExtensionPending(app_data.app_id())));
+          app_data, external_cache_->IsExtensionPending(app_data.app_id()),
+          app_data.app_id() == currently_auto_launched_app_));
+    }
   }
 }
 
 bool KioskAppManager::GetApp(const std::string& app_id, App* app) const {
   const KioskAppData* data = GetAppData(app_id);
   if (!data)
     return false;
 
-  *app = App(*data, external_cache_->IsExtensionPending(app_id));
+  *app = App(*data, external_cache_->IsExtensionPending(app_id),
+             app_id == currently_auto_launched_app_);
   return true;
 }
 
 bool KioskAppManager::GetDisableBailoutShortcut() const {
   bool enable;
   if (CrosSettings::Get()->GetBoolean(
           kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled, &enable)) {
     return !enable;
   }
 
@@ skipping 298 matching lines @@
   *cache_dir = user_data_dir.AppendASCII(kCrxCacheDir);
 }
 
 void KioskAppManager::GetCrxUnpackDir(base::FilePath* unpack_dir) {
   base::FilePath temp_dir;
   base::GetTempDir(&temp_dir);
   *unpack_dir = temp_dir.AppendASCII(kCrxUnpackDir);
 }
 
 }  // namespace chromeos