Screensaver at login screen.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 347366fdd450498d3ce9117662112f49ec10613d..95b234e395e00f4d742cae596f0de35ea822a422 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -25,6 +25,7 @@
 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
+#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
@@ -197,7 +198,11 @@ void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line,
           size.SetSize(width, height);
       }
     }
+
     browser::ShowLoginWizard(first_screen, size);
+
+    if (parsed_command_line.HasSwitch(switches::kEnableKioskMode))
+      chromeos::InitializeKioskModeScreensaver();
   } else if (parsed_command_line.HasSwitch(switches::kLoginUser) &&
       parsed_command_line.HasSwitch(switches::kLoginPassword)) {
     chromeos::BootTimesLoader::Get()->RecordLoginAttempted();
@@ -221,6 +226,7 @@ ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos(
 }
 
 ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
+  chromeos::ShutdownKioskModeScreensaver();
   cryptohome::AsyncMethodCaller::Shutdown();
   chromeos::imageburner::BurnManager::Shutdown();
   chromeos::disks::DiskMountManager::Shutdown();