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

Unified Diff: chrome/browser/chromeos/login/lock/webui_screen_locker.cc

Issue 2574493002: ignore: trybots (forced-on shared lock screen) (Closed)
Patch Set: rebase 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/lock/webui_screen_locker.cc
diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc
index e067ebecf25eb29b883a732815a37003a314ad47..84fbfdab56ab3441dbcedd48f3954d2a2f58cfcc 100644
--- a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc
+++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc
@@ -81,22 +81,7 @@ void WebUIScreenLocker::RequestPreload() {
// static
bool WebUIScreenLocker::ShouldPreloadLockScreen() {
- Profile* profile = ProfileHelper::Get()->GetProfileByUser(
- user_manager::UserManager::Get()->GetActiveUser());
-
- // We only want to preload the lock screen if the user is likely to see the
- // lock screen (since caching the lock screen uses memory). Without
- // preloading, showing the lock screen can take so long we will timeout and
- // crash the browser process (which currently takes down all of Chrome). See
- // crbug.com/452599 for more context.
- //
- // prefs::kEnableAutoScreenLock controls if the lock screen is shown on
- // suspend, so that is our primary hueristic.
-
- // Note that |profile| can be null in tests.
- return base::FeatureList::IsEnabled(features::kPreloadLockScreen) &&
- profile &&
- profile->GetPrefs()->GetBoolean(prefs::kEnableAutoScreenLock);
+ return true;
}
// static
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698