chrome/browser/signin/signin_manager_base.cc - Issue 137553007: User cloud policy token forwarder: Replace PO2TS::GetPrimaryAccountId() with SMB::GetAuthenticatedAc

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_manager_base.cc

Issue 137553007: User cloud policy token forwarder: Replace PO2TS::GetPrimaryAccountId() with SMB::GetAuthenticatedAc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased Created 6 years, 10 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/services/gcm/gcm_profile_service_unittest.cc ('K') | « chrome/browser/signin/signin_manager.cc ('k') | chrome/browser/sync/test/integration/profile_sync_service_harness.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/signin/signin_manager_base.cc

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

index fd24361ef5368e9246fbfedd22e6c16ccc84e2db..546973ea3f75219011d8e256e4168fb7e8e9e96c 100644

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

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

@@ -89,11 +89,12 @@ void SigninManagerBase::SetAuthenticatedUsername(const std::string& username) {

return;

#endif

}

+ std::string pref_username = profile_->GetPrefs()->GetString(

+ prefs::kGoogleServicesUsername);

+ DCHECK(pref_username.empty() ||

+ gaia::AreEmailsSame(username, pref_username));

authenticated_username_ = username;

- // TODO(tim): We could go further in ensuring kGoogleServicesUsername and

- // authenticated_username_ are consistent once established (e.g. remove

- // authenticated_username_ altogether). Bug 107160.

+ profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, username);

NotifyDiagnosticsObservers(USERNAME, username);

// Go ahead and update the last signed in username here as well. Once a