| Index: chrome/browser/chromeos/login/session/chrome_session_manager.cc
|
| diff --git a/chrome/browser/chromeos/login/session/chrome_session_manager.cc b/chrome/browser/chromeos/login/session/chrome_session_manager.cc
|
| index 9845fa8428bda2a2ea63cb0334747a9a62da4dc1..f0979eb6841f2207400de8d945c737c3283bea80 100644
|
| --- a/chrome/browser/chromeos/login/session/chrome_session_manager.cc
|
| +++ b/chrome/browser/chromeos/login/session/chrome_session_manager.cc
|
| @@ -18,7 +18,6 @@
|
| #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
|
| #include "chrome/browser/chromeos/arc/arc_service_launcher.h"
|
| #include "chrome/browser/chromeos/boot_times_recorder.h"
|
| -#include "chrome/browser/chromeos/idle_detector.h"
|
| #include "chrome/browser/chromeos/login/lock/webui_screen_locker.h"
|
| #include "chrome/browser/chromeos/login/login_wizard.h"
|
| #include "chrome/browser/chromeos/login/session/user_session_manager.h"
|
| @@ -48,9 +47,6 @@ namespace chromeos {
|
|
|
| namespace {
|
|
|
| -// Duration of user inactivity before preloading the lock screen.
|
| -constexpr int kIdleSecondsBeforePreloadingLockScreen = 8;
|
| -
|
| // Whether kiosk auto launch should be started.
|
| bool ShouldAutoLaunchKioskApp(const base::CommandLine& command_line) {
|
| KioskAppManager* app_manager = KioskAppManager::Get();
|
| @@ -238,12 +234,7 @@ void ChromeSessionManager::SessionStarted() {
|
| content::Details<const user_manager::User>(
|
| user_manager->GetActiveUser()));
|
|
|
| - if (chromeos::WebUIScreenLocker::ShouldShareLockScreen()) {
|
| - idle_detector_ = base::MakeUnique<chromeos::IdleDetector>(
|
| - base::Bind(&chromeos::WebUIScreenLocker::Preload));
|
| - idle_detector_->Start(
|
| - base::TimeDelta::FromSeconds(kIdleSecondsBeforePreloadingLockScreen));
|
| - }
|
| + chromeos::WebUIScreenLocker::RequestPreload();
|
| }
|
|
|
| void ChromeSessionManager::NotifyUserLoggedIn(const AccountId& user_account_id,
|
|
|