Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(631)

Unified Diff: chrome/browser/chromeos/login/session/chrome_session_manager.cc

Issue 2610373002: cros: Only preload the lock screen; do not reuse it. (Closed)
Patch Set: Address comments Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 bccc2f754e71138689aa6ae3f0d76bf65a178b77..66cef620218c97466e3c2f964879f17e4b1d9ad9 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"
@@ -47,9 +46,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();
@@ -232,12 +228,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,
« no previous file with comments | « chrome/browser/chromeos/login/session/chrome_session_manager.h ('k') | chrome/browser/chromeos/login/ui/preloaded_web_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698