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

chrome/browser/chromeos/login/app_launch_controller.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/login/app_launch_controller.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 108 matching lines @@
       network_wait_timedout_(false),
       showing_network_dialog_(false),
       network_config_requested_(false),
       launch_splash_start_time_(0) {
 }
 
 AppLaunchController::~AppLaunchController() {
   app_launch_splash_screen_actor_->SetDelegate(NULL);
 }
 
-void AppLaunchController::StartAppLaunch() {
+void AppLaunchController::StartAppLaunch(bool is_auto_launch) {
   DVLOG(1) << "Starting kiosk mode...";
 
   webui_visible_ = host_->GetWebUILoginView()->webui_visible();
   if (!webui_visible_) {
     registrar_.Add(this, chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
                    content::NotificationService::AllSources());
   }
   launch_splash_start_time_ = base::TimeTicks::Now().ToInternalValue();
 
   // TODO(tengs): Add a loading profile app launch state.
   app_launch_splash_screen_actor_->SetDelegate(this);
   app_launch_splash_screen_actor_->Show(app_id_);
 
   KioskAppManager::App app;
   CHECK(KioskAppManager::Get());
   CHECK(KioskAppManager::Get()->GetApp(app_id_, &app));
+
+  if (is_auto_launch) {
+    int delay;
+    if (!CrosSettings::Get()->GetInteger(
+            kAccountsPrefDeviceLocalAccountAutoLoginDelay, &delay)) {

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

Nit: #include "chromeos/settings/cros_settings_names.h"

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

Done.

+      delay = 0;
+    }
+    DCHECK_EQ(0, delay) << "Kiosks do not support non-zero auto-login delays";

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

It is great that you are putting this check in place but the brittleness of the
arrangement makes me feel uneasy. If someone was to implement non-zero delay
support in the future, they will just remove this check as the problem of not
supporting non-zero delay auto-login is "solved." They would not know that the
non-zero aspect is actually important to us.

How about we make it explicit that non-zero delay actually matters, by renaming
the various "auto_launched" and "AutoLaunched" to
"auto_launched_with_zero_delay" and "AutoLaunchedWithZeroDelay" and add comments
explaining why this matters?

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

Done.

+
+    // If we are launching a kiosk app with zero delay, mark it as
+    // auto-launched.
+    if (delay == 0)
+      KioskAppManager::Get()->SetAppWasAutoLaunched(app_id_);
+  }
+
   kiosk_profile_loader_.reset(
       new KioskProfileLoader(app.user_id, false, this));
   kiosk_profile_loader_->Start();
 }
 
 // static
 void AppLaunchController::SkipSplashWaitForTesting() {
   skip_splash_wait_ = true;
 }
 
@@ skipping 262 matching lines @@
   KioskAppLaunchError::Save(error);
   chrome::AttemptUserExit();
   CleanUp();
 }
 
 bool AppLaunchController::IsShowingNetworkConfigScreen() {
   return network_config_requested_;
 }
 
 }   // namespace chromeos