ChromeOS: Show the new POD RE-AUTH ICON when users needs to re-auth

chrome/browser/chromeos/login/screens/user_selection_screen.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
@@ skipping 387 matching lines @@
     // available when running into login screen on first boot.
     // See http://crosbug.com/12723
     bool can_remove_user =
         ((!single_user || is_enterprise_managed) && !user_id.empty() &&
          !is_owner && !is_public_account && !signed_in && !is_signin_to_add);
     user_dict->SetBoolean(kKeyCanRemove, can_remove_user);
     users_list.Append(user_dict);
   }
 
   handler_->LoadUsers(users_list, show_guest_);
+
+  CheckNextUserStatus("");

[dzhioev (left Google), 2015/06/22 23:51:24]

std::string()

[dzhioev (left Google), 2015/06/22 23:51:24]

In my opinion this implementation is too cryptic. Can't we launch status check
for every user in a single loop? Something like:

for (const User& user: users) {
  if (token_handle_util_->HasToken(user_id))
    token_handle_util_->CheckToken(user_id, <OnUserStatusChecked>);
}
    

[Denis Kuznetsov (DE-MUC), 2015/06/25 18:43:42]

Some magic constant that is not explained in method documentation is a bad
approach. Please either introduce additional method, explicit loop or special
constant for such behavior. 

[dzhioev (left Google), 2015/06/25 22:19:36]

Which constants are you talking about?

[Alexander Alekseev, 2015/06/30 20:43:39]

Done.

[Alexander Alekseev, 2015/06/30 20:43:39]

Done.

 }
 
 void UserSelectionScreen::HandleGetUsers() {
   SendUserList();
 }
 
 void UserSelectionScreen::CheckUserStatus(const std::string& user_id) {
+  CheckUserStatusImpl(user_id, false /* check_all_users */);
+}
+
+bool UserSelectionScreen::CheckUserStatusImpl(const std::string& user_id,
+                                              bool check_all_users) {
   // No checks on lock screen.
   if (ScreenLocker::default_screen_locker())
-    return;
+    return false;
 
   if (!token_handle_util_.get()) {
     token_handle_util_.reset(
         new TokenHandleUtil(user_manager::UserManager::Get()));
   }
 
   if (token_handle_util_->HasToken(user_id)) {
-    token_handle_util_->CheckToken(
+    return token_handle_util_->CheckToken(
         user_id, base::Bind(&UserSelectionScreen::OnUserStatusChecked,
-                            weak_factory_.GetWeakPtr()));
+                            weak_factory_.GetWeakPtr(), check_all_users));
+  }
+  return false;
+}
+
+void UserSelectionScreen::CheckNextUserStatus(
+    const std::string& current_user_id) {
+  const user_manager::UserList& users = GetUsers();
+  bool found = current_user_id.empty();
+  for (const user_manager::User* user : users) {
+    const std::string& next_user_id = user->email();
+
+    if (!found) {
+      if (next_user_id == current_user_id)
+        found = true;
+
+      continue;
+    }
+    if (CheckUserStatusImpl(next_user_id, true /* check_all_users */))
+      return;
   }
 }
 
 void UserSelectionScreen::OnUserStatusChecked(
+    const bool check_all_users,
     const user_manager::UserID& user_id,
     TokenHandleUtil::TokenHandleStatus status) {
   if (status == TokenHandleUtil::INVALID) {
     RecordReauthReason(user_id, ReauthReason::INVALID_TOKEN_HANDLE);
     token_handle_util_->MarkHandleInvalid(user_id);
     SetAuthType(user_id, ONLINE_SIGN_IN, base::string16());
   }
+  if (check_all_users)
+    CheckNextUserStatus(user_id);
 }
 
 // EasyUnlock stuff
 
 void UserSelectionScreen::SetAuthType(const std::string& user_id,
                                       AuthType auth_type,
                                       const base::string16& initial_value) {
   if (GetAuthType(user_id) == FORCE_OFFLINE_PASSWORD)
     return;
   DCHECK(GetAuthType(user_id) != FORCE_OFFLINE_PASSWORD ||
@@ skipping 107 matching lines @@
   // The user profile should exist if and only if this is the lock screen.
   DCHECK_EQ(!!profile, GetScreenType() == LOCK_SCREEN);
 
   if (!profile)
     profile = profile_helper->GetSigninProfile();
 
   return EasyUnlockService::Get(profile);
 }
 
 }  // namespace chromeos