chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc - Issue 398753004: [cros] Move User class to user_manager component.

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 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: add deps ( trybots) Created 6 years, 5 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/chromeos/extensions/wallpaper_private_api.cc ('K') | « chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc » ('j') | components/user_manager/user_type.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 3c31fccf733cf60ed4d0e8b06112999b837e375c..39a5d73e3c650fba0e3ead773bc1b25ed5068a87 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

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

UserManager* user_manager = UserManager::Get();

// Only the primary user can change the locale.

- User* user = ProfileHelper::Get()->GetUserByProfile(profile);

+ user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile);

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

profile->ChangeAppLocale(language_code,

Profile::APP_LOCALE_CHANGED_VIA_SETTINGS);