[Smart Lock] Re-disable lock screen password entry button when needed.

Unlocking by pressing the submit button is initially disabled, and only
enabled when Smart Lock finds the phone and the phone is unlocked.
This change makes sure that Smart Lock cleans up after itself if the
phone can no longer be found or becomes locked (making the submit button
disabled again).

Bug: 943211
Change-Id: Ie347cb009732fd60ac7ba27f13c44f337c3ae793
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1755187
Commit-Queue: Ryan Hansberry <hansberry@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#687367}

ash/login/ui/login_data_dispatcher.cc

@@ -101,12 +101,6 @@ void LoginDataDispatcher::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void LoginDataDispatcher::SetTapToUnlockEnabledForUser(const AccountId& user,
-                                                       bool enabled) {
-  for (auto& observer : observers_)
-    observer.OnTapToUnlockEnabledForUserChanged(user, enabled);
-}
-
 void LoginDataDispatcher::SetUserList(const std::vector<LoginUserInfo>& users) {
   for (auto& observer : observers_)
     observer.OnUsersChanged(users);
@@ -158,8 +152,10 @@ void LoginDataDispatcher::DisableAuthForUser(
     observer.OnAuthDisabledForUser(account_id, auth_disabled_data);
 }
 
-void LoginDataDispatcher::EnableTapToUnlockForUser(const AccountId& user) {
-  SetTapToUnlockEnabledForUser(user, true);
+void LoginDataDispatcher::SetTapToUnlockEnabledForUser(const AccountId& user,
+                                                       bool enabled) {
+  for (auto& observer : observers_)
+    observer.OnTapToUnlockEnabledForUserChanged(user, enabled);
 }
 
 void LoginDataDispatcher::ForceOnlineSignInForUser(const AccountId& user) {

ash/login/ui/login_data_dispatcher.h

@@ -146,8 +146,6 @@ class ASH_EXPORT LoginDataDispatcher : public LoginScreenModel {
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
-  void SetTapToUnlockEnabledForUser(const AccountId& user, bool enabled);
-
   // LoginScreenModel:
   // TODO(estade): for now, LoginScreenModel overrides are mixed with
   // non-virtual methods. More of the non-virtual methods will become a part of
@@ -167,7 +165,8 @@ class ASH_EXPORT LoginDataDispatcher : public LoginScreenModel {
   void EnableAuthForUser(const AccountId& account_id) override;
   void DisableAuthForUser(const AccountId& account_id,
                           const AuthDisabledData& auth_disabled_data) override;
-  void EnableTapToUnlockForUser(const AccountId& user) override;
+  void SetTapToUnlockEnabledForUser(const AccountId& user,
+                                    bool enabled) override;
   void ForceOnlineSignInForUser(const AccountId& user) override;
   void SetLockScreenNoteState(mojom::TrayActionState state);
   void ShowEasyUnlockIcon(const AccountId& user,

ash/public/cpp/login_screen_model.h

@@ -77,8 +77,9 @@ class ASH_PUBLIC_EXPORT LoginScreenModel {
       const AccountId& account_id,
       const AuthDisabledData& auth_disabled_data) = 0;
 
-  // Sets the authentication type to tap-to-unlock for the user.
-  virtual void EnableTapToUnlockForUser(const AccountId& account_id) = 0;
+  // Enables or disables the authentication type to tap-to-unlock for the user.
+  virtual void SetTapToUnlockEnabledForUser(const AccountId& account_id,
+                                            bool enabled) = 0;
 
   // Forces online sign-in for the user.
   virtual void ForceOnlineSignInForUser(const AccountId& account_id) = 0;

chrome/browser/chromeos/login/user_board_view_mojo.cc

@@ -122,12 +122,11 @@ void UserBoardViewMojo::HideUserPodCustomIcon(const AccountId& account_id) {
 void UserBoardViewMojo::SetAuthType(const AccountId& account_id,
                                     proximity_auth::mojom::AuthType auth_type,
                                     const base::string16& initial_value) {
-  if (auth_type == proximity_auth::mojom::AuthType::USER_CLICK) {
-    ash::LoginScreen::Get()->GetModel()->EnableTapToUnlockForUser(account_id);
-  } else if (auth_type == proximity_auth::mojom::AuthType::ONLINE_SIGN_IN) {
+  ash::LoginScreen::Get()->GetModel()->SetTapToUnlockEnabledForUser(
+      account_id, auth_type == proximity_auth::mojom::AuthType::USER_CLICK);
+
+  if (auth_type == proximity_auth::mojom::AuthType::ONLINE_SIGN_IN) {
     ash::LoginScreen::Get()->GetModel()->ForceOnlineSignInForUser(account_id);
-  } else {
-    NOTIMPLEMENTED();
   }
 }
 

chrome/browser/ui/ash/test_login_screen_model.cc

@@ -22,8 +22,9 @@ void TestLoginScreenModel::EnableAuthForUser(const AccountId& account_id) {}
 void TestLoginScreenModel::DisableAuthForUser(
     const AccountId& account_id,
     const ash::AuthDisabledData& auth_disabled_data) {}
-void TestLoginScreenModel::EnableTapToUnlockForUser(
-    const AccountId& account_id) {}
+void TestLoginScreenModel::SetTapToUnlockEnabledForUser(
+    const AccountId& account_id,
+    bool enabled) {}
 void TestLoginScreenModel::ForceOnlineSignInForUser(
     const AccountId& account_id) {}
 void TestLoginScreenModel::ShowEasyUnlockIcon(

chrome/browser/ui/ash/test_login_screen_model.h

@@ -27,7 +27,8 @@ class TestLoginScreenModel : public ash::LoginScreenModel {
   void DisableAuthForUser(
       const AccountId& account_id,
       const ash::AuthDisabledData& auth_disabled_data) override;
-  void EnableTapToUnlockForUser(const AccountId& account_id) override;
+  void SetTapToUnlockEnabledForUser(const AccountId& account_id,
+                                    bool enabled) override;
   void ForceOnlineSignInForUser(const AccountId& account_id) override;
   void ShowEasyUnlockIcon(const AccountId& user,
                           const ash::EasyUnlockIconOptions& icon) override;