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

Unified Diff: chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.cc

Issue 2529103002: Add account_type into AccountId (Closed)
Patch Set: Fix MultiUserWindowManagerChromeOSTest.* Created 4 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.cc
diff --git a/chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.cc b/chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.cc
index b5c8f1a4d352d62cdeef8ee85d97511edf2866b2..d7d9c095a713b69fdd7813076b35d51cbaa27a3a 100644
--- a/chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.cc
+++ b/chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.cc
@@ -11,6 +11,7 @@
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
#include "components/prefs/scoped_user_pref_update.h"
+#include "components/signin/core/account_id/account_id.h"
#include "components/user_manager/known_user.h"
namespace chromeos {
@@ -66,7 +67,8 @@ void BootstrapManager::RemoveAllPendingBootstrap() {
if (users->GetString(i, &current_user_email)) {
delegate_->RemovePendingBootstrapUser(
user_manager::known_user::GetAccountId(current_user_email,
- std::string() /* gaia_id */));
+ std::string() /* id */,
+ AccountType::UNKNOWN));
}
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698