chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc - Issue 1412813003: This CL replaces user_manager::UserID with AccountId.

Side by Side Diff: chrome/browser/ui/webui/chromeos/ui_account_tweaks.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 unified diff | Download patch

« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc ('k') | chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"	5 #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"

6	6

7 #include "base/strings/utf_string_conversions.h"	7 #include "base/strings/utf_string_conversions.h"

8 #include "base/values.h"	8 #include "base/values.h"

9 #include "chrome/browser/chromeos/profiles/profile_helper.h"	9 #include "chrome/browser/chromeos/profiles/profile_helper.h"

10 #include "chrome/browser/chromeos/settings/cros_settings.h"	10 #include "chrome/browser/chromeos/settings/cros_settings.h"

11 #include "chromeos/settings/cros_settings_names.h"	11 #include "chromeos/settings/cros_settings_names.h"

12 #include "components/user_manager/user_manager.h"	12 #include "components/user_manager/user_manager.h"

13 #include "content/public/browser/web_ui_data_source.h"	13 #include "content/public/browser/web_ui_data_source.h"

14	14

15 namespace chromeos {	15 namespace chromeos {

16	16

17 void AddAccountUITweaksLocalizedValues(	17 void AddAccountUITweaksLocalizedValues(

18 base::DictionaryValue* localized_strings,	18 base::DictionaryValue* localized_strings,

19 Profile* profile) {	19 Profile* profile) {

20 DCHECK(localized_strings);	20 DCHECK(localized_strings);

21	21

22 std::string owner_email;	22 std::string owner_email;

23 CrosSettings::Get()->GetString(kDeviceOwner, &owner_email);	23 CrosSettings::Get()->GetString(kDeviceOwner, &owner_email);

24 // Translate owner's email to the display email.	24 // Translate owner's email to the display email.

25 std::string display_email =	25 std::string display_email =

26 user_manager::UserManager::Get()->GetUserDisplayEmail(owner_email);	26 user_manager::UserManager::Get()->GetUserDisplayEmail(

	27 AccountId::FromUserEmail(owner_email));

27 localized_strings->SetString("ownerUserId", display_email);	28 localized_strings->SetString("ownerUserId", display_email);

28	29

29 localized_strings->SetBoolean("currentUserIsOwner",	30 localized_strings->SetBoolean("currentUserIsOwner",

30 ProfileHelper::IsOwnerProfile(profile));	31 ProfileHelper::IsOwnerProfile(profile));

31	32

32 localized_strings->SetBoolean(	33 localized_strings->SetBoolean(

33 "loggedInAsGuest", user_manager::UserManager::Get()->IsLoggedInAsGuest());	34 "loggedInAsGuest", user_manager::UserManager::Get()->IsLoggedInAsGuest());

34	35

35 localized_strings->SetBoolean(	36 localized_strings->SetBoolean(

36 "loggedInAsSupervisedUser",	37 "loggedInAsSupervisedUser",

37 user_manager::UserManager::Get()->IsLoggedInAsSupervisedUser());	38 user_manager::UserManager::Get()->IsLoggedInAsSupervisedUser());

38	39

39 localized_strings->SetBoolean(	40 localized_strings->SetBoolean(

40 "loggedInAsPublicAccount",	41 "loggedInAsPublicAccount",

41 user_manager::UserManager::Get()->IsLoggedInAsPublicAccount());	42 user_manager::UserManager::Get()->IsLoggedInAsPublicAccount());

42 }	43 }

43	44

44 void AddAccountUITweaksLocalizedValues(	45 void AddAccountUITweaksLocalizedValues(

45 content::WebUIDataSource* source,	46 content::WebUIDataSource* source,

46 Profile* profile) {	47 Profile* profile) {

47 DCHECK(source);	48 DCHECK(source);

48 base::DictionaryValue dict;	49 base::DictionaryValue dict;

49 AddAccountUITweaksLocalizedValues(&dict, profile);	50 AddAccountUITweaksLocalizedValues(&dict, profile);

50 source->AddLocalizedStrings(dict);	51 source->AddLocalizedStrings(dict);

51 }	52 }

52	53

53 } // namespace chromeos	54 } // namespace chromeos

OLD	NEW