Check for login screen availibility before showing spinner.

chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

 // Copyright (c) 2012 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/kiosk_mode/kiosk_mode_screensaver.h"
 
 #include "ash/screensaver/screensaver_view.h"
 #include "ash/shell.h"
 #include "ash/wm/user_activity_detector.h"
 #include "base/bind.h"
@@ skipping 159 matching lines @@
           &SandboxedUnpacker::Start, screensaver_unpacker.get()));
 }
 
 void KioskModeScreensaver::SetupScreensaver(
     scoped_refptr<Extension> extension,
     const FilePath& extension_base_path) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   extension_base_path_ = extension_base_path;
 
   // If the user is already logged in, don't need to display the screensaver.
-  if (chromeos::UserManager::Get()->IsUserLoggedIn())
+  if (chromeos::UserManager::Get()->IsSessionStarted())

[Nikita (slow), 2012/11/07 10:51:37]

Difference between these two is that IsSessionStarted() will return true when we
are past choose avatar screen.
In retail mode case that should not happen, right?

Leave IsUserLoggedIn() ?

[rkc, 2012/11/07 20:25:02]

IsSessionStarted seemed more appropriate (since it means that the user session
has actually started, versus there is a logged in user) - but yes, both should
do the same thing for KioskMode.

Done.

     return;
 
   ash::Shell::GetInstance()->user_activity_detector()->AddObserver(this);
 
   Profile* default_profile = ProfileManager::GetDefaultProfile();
   // Add the extension to the extension service and display the screensaver.
   if (default_profile) {
     default_profile->GetExtensionService()->AddExtension(extension);
     ash::ShowScreensaver(extension->GetFullLaunchURL());
   } else {
     LOG(ERROR) << "Couldn't get default profile. Unable to load screensaver!";
     ShutdownKioskModeScreensaver();
   }
 }
 
 void KioskModeScreensaver::OnUserActivity() {
   // We don't want to handle further user notifications; we'll either login
   // the user and close out or or at least close the screensaver.
   ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this);
 
   // Find the retail mode login page.
-  CHECK(WebUILoginDisplayHost::default_host());
-  WebUILoginDisplayHost* webui_host =
-      static_cast<WebUILoginDisplayHost*>(
-          WebUILoginDisplayHost::default_host());
-  OobeUI* oobe_ui = webui_host->GetOobeUI();
+  if (WebUILoginDisplayHost::default_host()) {

[Nikita (slow), 2012/11/07 10:51:37]

If default_host is gone now I believe login already happened so calling
LoginAsDemoUser() seems to be redundant?

[rkc, 2012/11/07 20:25:02]

If you're certain that is the only case that the default_host would be gone for,
then not doing the LoginAsDemoUser makes sense.

Done.

+    WebUILoginDisplayHost* webui_host =
+        static_cast<WebUILoginDisplayHost*>(
+            WebUILoginDisplayHost::default_host());
+    OobeUI* oobe_ui = webui_host->GetOobeUI();
 
-  // Show the login spinner.
-  CHECK(oobe_ui);
-  oobe_ui->ShowRetailModeLoginSpinner();
+    // Show the login spinner.
+    if (oobe_ui)
+      oobe_ui->ShowRetailModeLoginSpinner();
+  }
 
   // Close the screensaver, our login spinner is already showing.
   ash::CloseScreensaver();
 
   // Log us in.
   ExistingUserController* controller =
       ExistingUserController::current_controller();
-  CHECK(controller);
-  controller->LoginAsDemoUser();
+  if (controller && !chromeos::UserManager::Get()->IsSessionStarted())
+    controller->LoginAsDemoUser();
 
   ShutdownKioskModeScreensaver();
 }
 
 static KioskModeScreensaver* g_kiosk_mode_screensaver = NULL;
 
 void InitializeKioskModeScreensaver() {
   if (g_kiosk_mode_screensaver) {
     LOG(WARNING) << "Screensaver was already initialized";
     return;
   }
 
   g_kiosk_mode_screensaver = new KioskModeScreensaver();
 }
 
 void ShutdownKioskModeScreensaver() {
   delete g_kiosk_mode_screensaver;
   g_kiosk_mode_screensaver = NULL;
 }
 
 }  // namespace chromeos