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 579f7bc255e9ee54c0adf4fd14b9b2c7b2661a8e..e46f5f8fb84a7d5ccdc38a258de69e980c5dfb90 100644 |
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
@@ -26,6 +26,7 @@ |
#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_helper.h" |
+#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.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" |
@@ -363,7 +364,11 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
// Initialize the screen locker now so that it can receive |
// LOGIN_USER_CHANGED notification from UserManager. |
- chromeos::ScreenLocker::InitClass(); |
+ if (chromeos::KioskModeHelper::IsKioskModeEnabled()) { |
+ chromeos::InitializeKioskModeIdleLogout(); |
+ } else { |
+ chromeos::ScreenLocker::InitClass(); |
+ } |
// This forces the ProfileManager to be created and register for the |
// notification it needs to track the logged in user. |