Simplifed logic of showing/hiding cancel buttons on login screens.

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

 // Copyright (c) 2013 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/ui/webui/chromeos/login/signin_screen_handler.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/shell.h"
@@ skipping 868 matching lines @@
 
 void SigninScreenHandler::OnPreferencesChanged() {
   // Make sure that one of the login UI is fully functional now, otherwise
   // preferences update would be picked up next time it will be shown.
   if (!webui_visible_) {
     LOG(WARNING) << "Login UI is not active - postponed prefs change.";
     preferences_changed_delayed_ = true;
     return;
   }
 
+  // Send the updated user list to the UI.
+  if (delegate_)
+    delegate_->HandleGetUsers();
+
   if (delegate_ && !delegate_->IsShowUsers()) {
     HandleShowAddUser(nullptr);
   } else {
-    if (delegate_)
-      delegate_->HandleGetUsers();
     UpdateUIState(UI_STATE_ACCOUNT_PICKER, nullptr);
   }
+
   preferences_changed_delayed_ = false;
 }
 
 void SigninScreenHandler::ResetSigninScreenHandlerDelegate() {
   SetDelegate(nullptr);
 }
 
 void SigninScreenHandler::ShowError(int login_attempts,
                                     const std::string& error_text,
                                     const std::string& help_link_text,
@@ skipping 502 matching lines @@
   return gaia_screen_handler_->frame_error();
 }
 
 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
   caps_lock_enabled_ = enabled;
   if (page_is_ready())
     CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
 }
 
 }  // namespace chromeos