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

Unified Diff: chrome/browser/chromeos/login/screens/user_selection_screen.cc

Issue 1470633002: ChromeOS: Fix removeUser button on signin screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@462823--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Fix-GetKnownUserAccountId
Patch Set: Rebased. Created 5 years, 1 month 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/chromeos/login/screens/user_selection_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
index ecdedad88b85776aa82a6e4dd98b786469fdbba9..c2df683dd457b54069f5d02b229ae9267011bbaf 100644
--- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
@@ -264,20 +264,20 @@ void UserSelectionScreen::Init(const user_manager::UserList& users,
activity_detector->AddObserver(this);
}
-void UserSelectionScreen::OnBeforeUserRemoved(const std::string& username) {
+void UserSelectionScreen::OnBeforeUserRemoved(const AccountId& account_id) {
for (user_manager::UserList::iterator it = users_.begin(); it != users_.end();
++it) {
- if ((*it)->email() == username) {
+ if ((*it)->GetAccountId() == account_id) {
users_.erase(it);
break;
}
}
}
-void UserSelectionScreen::OnUserRemoved(const std::string& username) {
+void UserSelectionScreen::OnUserRemoved(const AccountId& account_id) {
if (!handler_)
return;
- handler_->OnUserRemoved(username, users_.empty());
+ handler_->OnUserRemoved(account_id, users_.empty());
}
void UserSelectionScreen::OnUserImageChanged(const user_manager::User& user) {

Powered by Google App Engine
This is Rietveld 408576698