Commit f9ea11d6 authored by James Hawkins's avatar James Hawkins Committed by Commit Bot

LoginDisplayHostMojo: Wire up (more) SmartLock.

This fixes a regression in the sense that Views login recently became
the default for some set of users, and SmartLock probably never worked
for login on Views (but it did work on WebUI login).

R=jdufault@chromium.org

Bug: 844532
Test: none yet, need to write E2E
Change-Id: I736f2ea3e8b7fc4d961852c5fb649f03a904d333
Reviewed-on: https://chromium-review.googlesource.com/1066935Reviewed-by: default avatarJacob Dufault <jdufault@chromium.org>
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Cr-Commit-Position: refs/heads/master@{#560319}
parent 2d8012e3
......@@ -59,6 +59,7 @@ void LoginDisplayHostMojo::SetUsers(const user_manager::UserList& users) {
LoginDisplay* LoginDisplayHostMojo::CreateLoginDisplay(
LoginDisplay::Delegate* delegate) {
user_selection_screen_->SetLoginDisplayDelegate(delegate);
return new LoginDisplayMojo(delegate, this);
}
......@@ -137,6 +138,8 @@ void LoginDisplayHostMojo::OnStartSignInScreen(
// Load the UI.
existing_user_controller_->Init(user_manager::UserManager::Get()->GetUsers());
user_selection_screen_->InitEasyUnlock();
}
void LoginDisplayHostMojo::OnPreferencesChanged() {
......@@ -246,6 +249,7 @@ void LoginDisplayHostMojo::HandleRecordClickOnLockIcon(
void LoginDisplayHostMojo::HandleOnFocusPod(const AccountId& account_id) {
// TODO(jdufault): Share common code between this and
// ViewsScreenLocker::HandleOnFocusPod See https://crbug.com/831787.
proximity_auth::ScreenlockBridge::Get()->SetFocusedUser(account_id);
user_selection_screen_->CheckUserStatus(account_id);
WallpaperControllerClient::Get()->ShowUserWallpaper(account_id);
focused_pod_account_id_ = account_id;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment