On active, dismiss the retail mode screensaver immidiately.

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"
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
+#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

[xiyuan, 2012/10/24 22:03:19]

nit: sort alphabetically

[rkc, 2012/10/24 22:05:58]

Done.

 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/login/webui_login_display_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/sandboxed_unpacker.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
 using extensions::Extension;
 using extensions::SandboxedUnpacker;
@@ skipping 96 matching lines @@
         FROM_HERE,
         base::Bind(
             &extension_file_util::DeleteFile, extension_base_path_, true));
   }
 
   // In case we're shutting down without ever triggering the active
   // notification and/or logging in.
   if (ash::Shell::GetInstance() &&
       ash::Shell::GetInstance()->user_activity_detector())
     ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this);
-  registrar_.RemoveAll();
 }
 
 void KioskModeScreensaver::GetScreensaverCrxPath() {
   chromeos::KioskModeSettings::Get()->GetScreensaverPath(
       base::Bind(&KioskModeScreensaver::ScreensaverPathCallback,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void KioskModeScreensaver::ScreensaverPathCallback(
     const FilePath& screensaver_crx) {
@@ skipping 27 matching lines @@
 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())
     return;
 
-  // Add our observers for login and user active.
-  registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
-                 content::NotificationService::AllSources());
   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();
   }
 }
 
-// NotificationObserver overrides:
-void KioskModeScreensaver::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  DCHECK_EQ(type, chrome::NOTIFICATION_SESSION_STARTED);
-
-  registrar_.RemoveAll();
-
-  ash::CloseScreensaver();
-  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);
 
-  // User is active, log us in.
+  // 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();
+
+  // Show the login spinner.
+  CHECK(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) {
-    // Logging in will shut us down and remove the screen saver.
-    controller->LoginAsDemoUser();
-  } else {
-    // Remove the screensaver so the user can at least use the underlying
-    // login screen to be able to log in.
-    ash::CloseScreensaver();
-    ShutdownKioskModeScreensaver();
-  }
+  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() {
+  if (ash::Shell::GetInstance()->user_activity_detector()->HasObserver(
+      g_kiosk_mode_screensaver))
+    ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(
+        g_kiosk_mode_screensaver);

[xiyuan, 2012/10/24 22:03:19]

There is similar code in KioskModeScreensaver's dtor already. Could we merge it
there?

[rkc, 2012/10/24 22:05:58]

Crap, didn't realize this was already being handled.
Removed the code, the delete will invoke it in the destructor.

Done.

+
   delete g_kiosk_mode_screensaver;
   g_kiosk_mode_screensaver = NULL;
 }
 
 }  // namespace chromeos