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

Unified Diff: chrome/browser/chromeos/login/ui/webui_login_display.cc

Issue 1063983002: Fix regression: allow resetting password and enabling UI input on screenlock (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/ui/webui_login_display.cc
diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.cc b/chrome/browser/chromeos/login/ui/webui_login_display.cc
index 8b4c5ff652df9b4f4cee317597255dd5a680ff87..d64116804a5bedcecc21032130141c1d96d3096a 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_display.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_display.cc
@@ -95,9 +95,9 @@ void WebUILoginDisplay::SetUIEnabled(bool is_enabled) {
// Allow this call only before user sign in or at lock screen.
// If this call is made after new user signs in but login screen is still
// around that would trigger a sign in extension refresh.
- if (is_enabled && (!user_manager::UserManager::Get()->IsUserLoggedIn() ||
- ScreenLocker::default_screen_locker()) &&
- !StartupUtils::IsWebviewSigninEnabled()) {
+ if (is_enabled && ((!user_manager::UserManager::Get()->IsUserLoggedIn() &&
+ !StartupUtils::IsWebviewSigninEnabled()) ||
Nikita (slow) 2015/04/07 09:36:30 ginkage@ I'm not sure that this condition even is
+ ScreenLocker::default_screen_locker())) {
ClearAndEnablePassword();
}
« 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