Index: chrome/browser/chromeos/login/lock/screen_locker.cc |
diff --git a/chrome/browser/chromeos/login/lock/screen_locker.cc b/chrome/browser/chromeos/login/lock/screen_locker.cc |
index 8f0715dbb4158fcb76056362597c044d8e24e54c..cc98afd7bae01b8912a5db7afad7e26b2c1a1c11 100644 |
--- a/chrome/browser/chromeos/login/lock/screen_locker.cc |
+++ b/chrome/browser/chromeos/login/lock/screen_locker.cc |
@@ -30,6 +30,8 @@ |
#include "chrome/browser/chrome_notification_types.h" |
#include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
#include "chrome/browser/chromeos/login/lock/webui_screen_locker.h" |
+#include "chrome/browser/chromeos/login/quick_unlock/fingerprint_unlock.h" |
+#include "chrome/browser/chromeos/login/quick_unlock/fingerprint_unlock_factory.h" |
#include "chrome/browser/chromeos/login/quick_unlock/pin_storage.h" |
#include "chrome/browser/chromeos/login/quick_unlock/pin_storage_factory.h" |
#include "chrome/browser/chromeos/login/session/user_session_manager.h" |
@@ -117,6 +119,11 @@ class ScreenLockObserver : public SessionManagerClient::StubDelegate, |
quick_unlock::PinStorageFactory::GetForUser(user); |
if (pin_storage) |
pin_storage->MarkStrongAuth(); |
+ |
+ quick_unlock::FingerprintUnlock* fingerprint_unlock = |
+ quick_unlock::FingerprintUnlockFactory::GetForUser(user); |
+ if (fingerprint_unlock) |
+ fingerprint_unlock->MarkStrongAuth(); |
} else { |
NOTREACHED() << "Unexpected notification " << type; |
} |
@@ -250,6 +257,12 @@ void ScreenLocker::OnAuthSuccess(const UserContext& user_context) { |
if (pin_storage) |
pin_storage->ResetUnlockAttemptCount(); |
+ quick_unlock::FingerprintUnlock* fingerprint_unlock = |
+ quick_unlock::FingerprintUnlockFactory::GetForAccountId( |
jdufault
2017/02/24 23:37:10
GetForUser?
xiaoyinh(OOO Sep 11-29)
2017/02/27 21:36:42
Changed.
|
+ user_context.GetAccountId()); |
+ if (fingerprint_unlock) |
+ fingerprint_unlock->ResetUnlockAttemptCount(); |
+ |
UserSessionManager::GetInstance()->UpdateEasyUnlockKeys(user_context); |
} else { |
NOTREACHED() << "Logged in user not found."; |
@@ -274,6 +287,12 @@ void ScreenLocker::OnPasswordAuthSuccess(const UserContext& user_context) { |
user_context.GetAccountId()); |
if (pin_storage) |
pin_storage->MarkStrongAuth(); |
+ |
+ quick_unlock::FingerprintUnlock* fingerprint_unlock = |
+ quick_unlock::FingerprintUnlockFactory::GetForAccountId( |
+ user_context.GetAccountId()); |
+ if (fingerprint_unlock) |
+ fingerprint_unlock->MarkStrongAuth(); |
} |
void ScreenLocker::UnlockOnLoginSuccess() { |