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

Unified Diff: chrome/browser/chromeos/login/signin/oauth2_login_manager.cc

Issue 1162103003: ListAccounts will return the Gaia ID as well as the email of the account. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 6 months 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/signin/oauth2_login_manager.cc
diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc b/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
index 890bd89ac1bf289dce49121aae4e8b281c0e8f79..f2f347bc993151b74a35441cb448820fb5a8e487 100644
--- a/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
+++ b/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
@@ -307,18 +307,18 @@ void OAuth2LoginManager::OnSessionMergeFailure(bool connection_error) {
}
void OAuth2LoginManager::OnListAccountsSuccess(
- const std::vector<std::pair<std::string, bool>>& accounts) {
+ const std::vector<gaia::ListedAccount>& accounts) {
MergeVerificationOutcome outcome = POST_MERGE_SUCCESS;
// Let's analyze which accounts we see logged in here:
std::string user_email = gaia::CanonicalizeEmail(GetPrimaryAccountId());
if (!accounts.empty()) {
bool found = false;
bool first = true;
- for (std::vector<std::pair<std::string, bool> >::const_iterator iter =
+ for (std::vector<gaia::ListedAccount>::const_iterator iter =
accounts.begin();
iter != accounts.end(); ++iter) {
- if (gaia::CanonicalizeEmail(iter->first) == user_email) {
- found = iter->second;
+ if (iter->email == user_email) {
+ found = iter->valid;
break;
}

Powered by Google App Engine
This is Rietveld 408576698