chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc - Issue 1165323004: We should use UserID object to identify users instead of username.

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/cros_language_options_handler.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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/profiles/profile_window.cc ('K') | « chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/user_image_source.h » ('j') | components/user_manager/user_id.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8efb2e323b2612f911c0276015457887a2372408..2efbeed6abd1f82ca252d1d91c163205fc4b760c 100644

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

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

@@ -190,7 +190,7 @@ void CrosLanguageOptionsHandler::SetApplicationLocale(

const user_manager::User* user =

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

if (user &&

- user->email() == user_manager->GetPrimaryUser()->email() &&

+ user->GetUserID() == user_manager->GetPrimaryUser()->GetUserID() &&

user->GetType() != user_manager::USER_TYPE_PUBLIC_ACCOUNT) {

profile->ChangeAppLocale(language_code,

Profile::APP_LOCALE_CHANGED_VIA_SETTINGS);