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

chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

Index: chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
index 86affa2eb9a99c32f645f77589b9fa93f1a44c5b..a6e4aa0d5d5f107bc44789c601a3cdbe2a546919 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
@@ -100,15 +100,17 @@ 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 {
@@ -131,6 +133,11 @@ void KioskAppManager::SetAutoLaunchApp(const std::string& app_id) {
       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 =
@@ -311,9 +318,11 @@ void KioskAppManager::GetApps(Apps* apps) const {
   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_));
+    }
   }
 }
 
@@ -322,7 +331,8 @@ bool KioskAppManager::GetApp(const std::string& app_id, App* app) const {
   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;
 }