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

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

Issue 642153003: Fix a startup crash from https://crrev.com/5eb3ae10901fa65657abc902910265ab492c5dbf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ,] Created 6 years, 2 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/session/user_session_manager.cc
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
index 219a1174038bda44694ed1170d9402ecda80aea2..236c38aeabbec729c613752c2783c748a978451b 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -1050,16 +1050,17 @@ void UserSessionManager::UpdateEasyUnlockKeys(const UserContext& user_context) {
EasyUnlockScreenlockStateHandler::NO_HARDLOCK);
}
+ EasyUnlockKeyManager* key_manager = GetEasyUnlockKeyManager();
running_easy_unlock_key_ops_ = true;
if (device_list) {
- easy_unlock_key_manager_->RefreshKeys(
+ key_manager->RefreshKeys(
user_context,
*device_list,
base::Bind(&UserSessionManager::OnEasyUnlockKeyOpsFinished,
AsWeakPtr(),
user_context.GetUserID()));
} else {
- easy_unlock_key_manager_->RemoveKeys(
+ key_manager->RemoveKeys(
user_context,
0,
base::Bind(&UserSessionManager::OnEasyUnlockKeyOpsFinished,
« 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