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

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 2715823004: Add FingerprintUnlock KeyedService for each profile (Closed)
Patch Set: Incorporate comments Created 3 years, 10 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
Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 4427b04e1ff303a76c290ae6901490eda0be2901..e2bb15c7d4294d3e0934ca76d347cb7459d21f48 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -40,8 +40,8 @@
#include "chrome/browser/chromeos/login/hwid_checker.h"
#include "chrome/browser/chromeos/login/lock/screen_locker.h"
#include "chrome/browser/chromeos/login/lock/webui_screen_locker.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/quick_unlock/quick_unlock_factory.h"
+#include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_storage.h"
#include "chrome/browser/chromeos/login/reauth_stats.h"
#include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
#include "chrome/browser/chromeos/login/screens/network_error.h"
@@ -956,10 +956,10 @@ void SigninScreenHandler::Initialize() {
if (user_manager::UserManager::IsInitialized()) {
for (user_manager::User* user :
user_manager::UserManager::Get()->GetLoggedInUsers()) {
-
- chromeos::quick_unlock::PinStorage* pin_storage =
- chromeos::quick_unlock::PinStorageFactory::GetForUser(user);
- if (pin_storage && pin_storage->IsPinAuthenticationAvailable()) {
+ chromeos::quick_unlock::QuickUnlockStorage* quick_unlock_storage =
+ chromeos::quick_unlock::QuickUnlockFactory::GetForUser(user);
+ if (quick_unlock_storage &&
+ quick_unlock_storage->pin_storage()->IsPinAuthenticationAvailable()) {
CallJS("cr.ui.Oobe.preloadPinKeyboard");
break;
}
@@ -1004,9 +1004,10 @@ void SigninScreenHandler::RefocusCurrentPod() {
}
void SigninScreenHandler::HidePinKeyboardIfNeeded(const AccountId& account_id) {
- chromeos::quick_unlock::PinStorage* pin_storage =
- chromeos::quick_unlock::PinStorageFactory::GetForAccountId(account_id);
- if (pin_storage && !pin_storage->IsPinAuthenticationAvailable())
+ chromeos::quick_unlock::QuickUnlockStorage* quick_unlock_storage =
+ chromeos::quick_unlock::QuickUnlockFactory::GetForAccountId(account_id);
+ if (quick_unlock_storage &&
+ !quick_unlock_storage->pin_storage()->IsPinAuthenticationAvailable())
CallJS("login.AccountPickerScreen.disablePinKeyboardForUser", account_id);
}
@@ -1159,10 +1160,11 @@ void SigninScreenHandler::HandleAuthenticateUser(const AccountId& account_id,
return;
DCHECK_EQ(account_id.GetUserEmail(),
gaia::SanitizeEmail(account_id.GetUserEmail()));
- chromeos::quick_unlock::PinStorage* pin_storage =
- chromeos::quick_unlock::PinStorageFactory::GetForAccountId(account_id);
+ chromeos::quick_unlock::QuickUnlockStorage* quick_unlock_storage =
+ chromeos::quick_unlock::QuickUnlockFactory::GetForAccountId(account_id);
// If pin storage is unavailable, authenticated by PIN must be false.
- DCHECK(!pin_storage || pin_storage->IsPinAuthenticationAvailable() ||
+ DCHECK(!quick_unlock_storage ||
+ quick_unlock_storage->pin_storage()->IsPinAuthenticationAvailable() ||
!authenticated_by_pin);
UserContext user_context(account_id);

Powered by Google App Engine
This is Rietveld 408576698