chrome/browser/chromeos/login/signin/oauth2_login_verifier.cc - Issue 1162103003: ListAccounts will return the Gaia ID as well as the email of the account.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/signin/oauth2_login_verifier.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

« no previous file with comments | « chrome/browser/chromeos/login/signin/oauth2_login_verifier.h ('k') | chrome/browser/resources/signin_internals/signin_index.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/signin/oauth2_login_verifier.cc

diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_verifier.cc b/chrome/browser/chromeos/login/signin/oauth2_login_verifier.cc

index b2f8a8a4c446df5db54d94c28548da2a75a46ba0..c9317a73a70e9d32da464804e6b6f72f0f003405 100644

--- a/chrome/browser/chromeos/login/signin/oauth2_login_verifier.cc

+++ b/chrome/browser/chromeos/login/signin/oauth2_login_verifier.cc

@@ -33,7 +33,7 @@ OAuth2LoginVerifier::~OAuth2LoginVerifier() {

void OAuth2LoginVerifier::VerifyUserCookies(Profile* profile) {

DCHECK_CURRENTLY_ON(BrowserThread::UI);

- std::vector<std::pair<std::string, bool> > accounts;

+ std::vector<gaia::ListedAccount> accounts;

if (cookie_manager_service_->ListAccounts(&accounts)) {

OnGaiaAccountsInCookieUpdated(

accounts, GoogleServiceAuthError(GoogleServiceAuthError::NONE));

@@ -68,8 +68,8 @@ void OAuth2LoginVerifier::OnAddAccountToCookieCompleted(

}

void OAuth2LoginVerifier::OnGaiaAccountsInCookieUpdated(

- const std::vector<std::pair<std::string, bool> >& accounts,

- const GoogleServiceAuthError& error) {

+ const std::vector<gaia::ListedAccount>& accounts,

+ const GoogleServiceAuthError& error) {

if (error.state() == GoogleServiceAuthError::State::NONE) {

VLOG(1) << "ListAccounts successful.";

delegate_->OnListAccountsSuccess(accounts);