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

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

Issue 2555453003: cros: HTML fixes needed to reinitializing an existing lock WebUI. (Closed)
Patch Set: Initial upload Created 4 years 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 bee099c2b7d1672e3b79fefec32bd418ffcc6182..be30ca52f81e210b85f90dd0a60e70c02cfdd037 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -900,6 +900,17 @@ void SigninScreenHandler::ReloadGaia(bool force_reload) {
}
void SigninScreenHandler::Initialize() {
+ // delegate_ is null when we are preloading the lock screen. There may be no
xiyuan 2016/12/09 22:47:21 nit: delegate_ -> |delegate_|
jdufault 2016/12/12 19:52:02 Done.
+ // primary user in a test.
+ if (user_manager::UserManager::IsInitialized() &&
+ user_manager::UserManager::Get()->GetPrimaryUser()) {
+ chromeos::PinStorage* pin_storage =
Alexander Alekseev 2016/12/10 01:26:49 I assume that you are only looaking at active user
jdufault 2016/12/12 19:52:02 I've changed this to iterate over every user.
+ chromeos::PinStorageFactory::GetForUser(
+ user_manager::UserManager::Get()->GetActiveUser());
+ if (pin_storage && pin_storage->IsPinAuthenticationAvailable())
+ CallJS("cr.ui.Oobe.preloadPin");
+ }
+
if (delegate_ && show_on_init_) {
show_on_init_ = false;
ShowImpl();

Powered by Google App Engine
This is Rietveld 408576698