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

chrome/browser/chromeos/login/ui/login_display_host_impl.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/ui/login_display_host_impl.h"
 
 #include <vector>
 
 #include "ash/audio/sounds.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 649 matching lines @@
 
 void LoginDisplayHostImpl::StartDemoAppLaunch() {
   VLOG(1) << "Login WebUI >> starting demo app.";
   SetStatusAreaVisible(false);
 
   demo_app_launcher_.reset(new DemoAppLauncher());
   demo_app_launcher_->StartDemoAppLaunch();
 }
 
 void LoginDisplayHostImpl::StartAppLaunch(const std::string& app_id,
-                                          bool diagnostic_mode) {
+                                          bool diagnostic_mode,
+                                          bool auto_launch) {
   VLOG(1) << "Login WebUI >> start app launch.";
   SetStatusAreaVisible(false);
 
   // Wait for the |CrosSettings| to become either trusted or permanently
   // untrusted.
   const CrosSettingsProvider::TrustedStatus status =
       CrosSettings::Get()->PrepareTrustedValues(base::Bind(
           &LoginDisplayHostImpl::StartAppLaunch,
           pointer_factory_.GetWeakPtr(),
           app_id,
-          diagnostic_mode));
+          diagnostic_mode,
+          auto_launch));
   if (status == CrosSettingsProvider::TEMPORARILY_UNTRUSTED)
     return;
 
   if (status == CrosSettingsProvider::PERMANENTLY_UNTRUSTED) {
     // If the |CrosSettings| are permanently untrusted, refuse to launch a
     // single-app kiosk mode session.
     LOG(ERROR) << "Login WebUI >> Refusing to launch single-app kiosk mode.";
     SetStatusAreaVisible(true);
     return;
   }
 
   bool device_disabled = false;
   CrosSettings::Get()->GetBoolean(kDeviceDisabled, &device_disabled);
   if (device_disabled && system::DeviceDisablingManager::
                              HonorDeviceDisablingDuringNormalOperation()) {
     // If the device is disabled, bail out. A device disabled screen will be
     // shown by the DeviceDisablingManager.
     return;
   }
 
   finalize_animation_type_ = ANIMATION_FADE_OUT;
   if (!login_window_)
     LoadURL(GURL(kAppLaunchSplashURL));
 
   login_view_->set_should_emit_login_prompt_visible(false);
 
   app_launch_controller_.reset(new AppLaunchController(
       app_id, diagnostic_mode, this, GetOobeUI()));
 
-  app_launch_controller_->StartAppLaunch();
+  app_launch_controller_->StartAppLaunch(auto_launch);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LoginDisplayHostImpl, public
 
 WizardController* LoginDisplayHostImpl::CreateWizardController() {
   // TODO(altimofeev): ensure that WebUI is ready.
   OobeDisplay* oobe_display = GetOobeUI();
   return new WizardController(this, oobe_display);
 }
@@ skipping 460 matching lines @@
           ? session_manager::SESSION_STATE_LOGIN_PRIMARY
           : session_manager::SESSION_STATE_OOBE);
 
   LoginDisplayHostImpl* display_host = new LoginDisplayHostImpl(screen_bounds);
 
   bool show_app_launch_splash_screen =
       (first_screen_name == WizardController::kAppLaunchSplashScreenName);
   if (show_app_launch_splash_screen) {
     const std::string& auto_launch_app_id =
         KioskAppManager::Get()->GetAutoLaunchApp();
+    const bool diagnostic_mode = false;
+    const bool auto_launch = true;
     display_host->StartAppLaunch(auto_launch_app_id,
-                                 false /* diagnostic_mode */);
+                                 diagnostic_mode,
+                                 auto_launch);
     return;
   }
 
   // Check whether we need to execute OOBE flow.
   const policy::EnrollmentConfig enrollment_config =
       g_browser_process->platform_part()
           ->browser_policy_connector_chromeos()
           ->GetPrescribedEnrollmentConfig();
   if (enrollment_config.should_enroll() && first_screen_name.empty()) {
     // Shows networks screen instead of enrollment screen to resume the
@@ skipping 61 matching lines @@
 
   locale_util::SwitchLanguageCallback callback(
       base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())));
 
   // Load locale keyboards here. Hardware layout would be automatically enabled.
   locale_util::SwitchLanguage(
       locale, true, true /* login_layouts_only */, callback);
 }
 
 }  // namespace chromeos