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 a82b8af6666947550a9565b14be9c69348d1d6a7..79c9ee4812318053e7fe4236eddc64149ff96b47 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::InitKioskModeScreensaver(); |
} else if (parsed_command_line.HasSwitch(switches::kLoginUser) && |
parsed_command_line.HasSwitch(switches::kLoginPassword)) { |
chromeos::BootTimesLoader::Get()->RecordLoginAttempted(); |