chrome/browser/chromeos/ownership/owner_settings_service_chromeos.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/ownership/owner_settings_service_chromeos.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: Fix Win GN build. Created 5 years, 1 month 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/net/network_portal_detector_impl_unittest.cc ('k') | chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc

diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc

index 6a4ba6d3f9f3ab39118d875e19a7704240040fb4..a6c5d91c7e757173182cf3c09c81dbafec8758e6 100644

--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc

+++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc

@@ -721,7 +721,7 @@ void OwnerSettingsServiceChromeOS::OnPostKeypairLoadedActions() {

const user_manager::User* user =

ProfileHelper::Get()->GetUserByProfile(profile_);

- user_id_ = user ? user->GetUserID() : std::string();

+ user_id_ = user ? user->GetAccountId().GetUserEmail() : std::string();

const bool is_owner = IsOwner() || IsOwnerInTests(user_id_);

if (is_owner && device_settings_service_)