chrome/browser/signin/signin_ui_util.cc - Issue 617183003: Make sure GetAuthenticatedAccountId() returns a canonicalized id.

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/signin/signin_ui_util.cc

Issue 617183003: Make sure GetAuthenticatedAccountId() returns a canonicalized id. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebased Created 6 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

« no previous file with comments | « chrome/browser/signin/android_profile_oauth2_token_service.cc ('k') | chrome/browser/sync/supervised_user_signin_manager_wrapper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/signin/signin_ui_util.cc

diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/signin_ui_util.cc

index c122f28c4bbd54d95c26e7b193747716fe1af1ac..831674775a5b24683d29c4d3501f30edee33780e 100644

--- a/chrome/browser/signin/signin_ui_util.cc

+++ b/chrome/browser/signin/signin_ui_util.cc

@@ -102,8 +102,6 @@ void GetStatusLabelsForAuthError(Profile* profile,

const SigninManagerBase& signin_manager,

base::string16* status_label,

base::string16* link_label) {

- base::string16 username =

- base::UTF8ToUTF16(signin_manager.GetAuthenticatedUsername());

base::string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);

if (link_label)

link_label->assign(l10n_util::GetStringUTF16(IDS_SYNC_RELOGIN_LINK_LABEL));

@@ -118,7 +116,7 @@ void GetStatusLabelsForAuthError(Profile* profile,

case GoogleServiceAuthError::ACCOUNT_DISABLED:

// If the user name is empty then the first login failed, otherwise the

// credentials are out-of-date.

- if (username.empty()) {

+ if (!signin_manager.IsAuthenticated()) {

if (status_label) {

status_label->assign(

l10n_util::GetStringUTF16(IDS_SYNC_INVALID_USER_CREDENTIALS));