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

Unified Diff: chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

Issue 1494153002: This CL replaces e-mail with AccountId in easy signin code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bugfix in original easy unlock code' Created 5 years 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/users/chrome_user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
index 426a0530ef659e99443ce3fe3a3bcdf25881dd97..4b79a9793b79a90d659e74d75caf2ca5a7344937 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
@@ -744,7 +744,7 @@ void ChromeUserManagerImpl::SupervisedUserLoggedIn(
bool ChromeUserManagerImpl::HasPendingBootstrap(
const AccountId& account_id) const {
- return bootstrap_manager_->HasPendingBootstrap(account_id.GetUserEmail());
+ return bootstrap_manager_->HasPendingBootstrap(account_id);
}
void ChromeUserManagerImpl::PublicAccountUserLoggedIn(
@@ -870,7 +870,7 @@ void ChromeUserManagerImpl::RemoveNonCryptohomeData(
multi_profile_user_controller_->RemoveCachedValues(account_id.GetUserEmail());
- EasyUnlockService::ResetLocalStateForUser(account_id.GetUserEmail());
+ EasyUnlockService::ResetLocalStateForUser(account_id);
}
void
@@ -1100,8 +1100,7 @@ void ChromeUserManagerImpl::OnUserNotAllowed(const std::string& user_email) {
}
void ChromeUserManagerImpl::RemovePendingBootstrapUser(
- const std::string& user_id) {
- const AccountId account_id(AccountId::FromUserEmail(user_id));
+ const AccountId& account_id) {
DCHECK(HasPendingBootstrap(account_id));
RemoveNonOwnerUserInternal(account_id, nullptr);
}

Powered by Google App Engine
This is Rietveld 408576698