chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc - Issue 1425093004: Revert of 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/ui/webui/options/chromeos/core_chromeos_options_handler.cc

Issue 1425093004: Revert of 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: 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

« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

index daed4a86b6dabd83dc961ba53845a835e22144a7..91f53821733c64f8912c57ba00d875ea599e5ee1 100644

--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

@@ -71,9 +71,7 @@

user_dict->SetString("name", display_email);

user_dict->SetString("email", display_name);

- const bool is_owner =

- user_manager::UserManager::Get()->GetOwnerAccountId().GetUserEmail() ==

- username;

+ bool is_owner = user_manager::UserManager::Get()->GetOwnerEmail() == username;

user_dict->SetBoolean("owner", is_owner);

return user_dict;

}

@@ -91,8 +89,7 @@

std::string email;

if ((*i)->GetAsString(&email)) {

// Translate email to the display email.

- const std::string display_email =

- user_manager->GetUserDisplayEmail(AccountId::FromUserEmail(email));

+ std::string display_email = user_manager->GetUserDisplayEmail(email);

// TODO(ivankr): fetch display name for existing users.

user_list->Append(CreateUserInfo(email, display_email, std::string()));

}

@@ -364,12 +361,10 @@

// Managed machines have no "owner".

localized_strings->SetString("controlledSettingOwner", base::string16());

} else {

- localized_strings->SetString(

- "controlledSettingOwner",

+ localized_strings->SetString("controlledSettingOwner",

l10n_util::GetStringFUTF16(

IDS_OPTIONS_CONTROLLED_SETTING_OWNER,

- base::ASCIIToUTF16(

- user_manager->GetOwnerAccountId().GetUserEmail())));

+ base::ASCIIToUTF16(user_manager->GetOwnerEmail())));

}