chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc - Issue 1412813003: This CL replaces user_manager::UserID with AccountId.

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/saml/saml_offline_signin_limiter.cc

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Rebased. Created 5 years, 2 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

« chrome/browser/chromeos/login/reauth_stats.cc ('K') | « chrome/browser/chromeos/login/saml/saml_browsertest.cc ('k') | chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc » ('j') | chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc

diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc

index 826aa1c6b220dd693eafd5f6616665b95b2d4be5..0906e625fde18c5447315ce3dd15b4819ebc7a86 100644

--- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc

+++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc

@@ -45,7 +45,7 @@ void SAMLOfflineSigninLimiter::SignedIn(UserContext::AuthFlow auth_flow) {

NOTREACHED();

return;

}

- const std::string& user_id = user->email();

+ const AccountId user_id = user->GetUserID();

achuithb 2015/10/23 00:08:50 account_id

Alexander Alekseev 2015/10/23 09:11:21 Done.

if (auth_flow == UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML) {

// The user went through online authentication and GAIA did not redirect to

@@ -143,8 +143,9 @@ void SAMLOfflineSigninLimiter::ForceOnlineLogin() {

return;

}

- user_manager::UserManager::Get()->SaveForceOnlineSignin(user->email(), true);

- RecordReauthReason(user->email(), ReauthReason::SAML_REAUTH_POLICY);

+ user_manager::UserManager::Get()->SaveForceOnlineSignin(user->GetUserID(),

+ true);

+ RecordReauthReason(user->GetUserID(), ReauthReason::SAML_REAUTH_POLICY);

offline_signin_limit_timer_.reset();

}