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

Unified Diff: chrome/browser/chromeos/login/screen_locker.cc

Issue 83543004: cros: Use first unlock user's pref for locking screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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/screen_locker.cc
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index a76a7f788e589ecec856213ddac2e5f2f8d850cd..a04f3578b309b6951e1cdd54ded202d5d4b6ce41 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -227,12 +227,8 @@ void ScreenLocker::OnLoginSuccess(const UserContext& user_context) {
}
}
- if (const User* user = UserManager::Get()->FindUser(user_context.username)) {
- if (!user->is_active())
- UserManager::Get()->SwitchActiveUser(user_context.username);
- } else {
+ if (!UserManager::Get()->FindUser(user_context.username))
NOTREACHED() << "Logged in user not found.";
- }
authentication_capture_.reset(new AuthenticationParametersCapture());
authentication_capture_->user_context = user_context;

Powered by Google App Engine
This is Rietveld 408576698