Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(661)

Unified Diff: chrome/browser/chromeos/policy/device_status_collector.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
Index: chrome/browser/chromeos/policy/device_status_collector.cc
diff --git a/chrome/browser/chromeos/policy/device_status_collector.cc b/chrome/browser/chromeos/policy/device_status_collector.cc
index eefbf419193080795ac803f3e7783927239fdf4b..74f27eff71dd77eee007f1ced625befb2a91d637 100644
--- a/chrome/browser/chromeos/policy/device_status_collector.cc
+++ b/chrome/browser/chromeos/policy/device_status_collector.cc
@@ -149,7 +149,7 @@ GetCurrentKioskDeviceLocalAccount(chromeos::CrosSettings* settings) {
return scoped_ptr<policy::DeviceLocalAccount>();
const user_manager::User* const user =
user_manager::UserManager::Get()->GetActiveUser();
- const std::string user_id = user->GetUserID();
+ const user_manager::UserID user_id = user->GetUserID();
const std::vector<policy::DeviceLocalAccount> accounts =
policy::GetDeviceLocalAccounts(settings);
@@ -781,10 +781,10 @@ void DeviceStatusCollector::GetUsers(em::DeviceStatusReportRequest* request) {
continue;
em::DeviceUser* device_user = request->add_user();
- const std::string& email = (*user)->email();
- if (connector->GetUserAffiliation(email) == USER_AFFILIATION_MANAGED) {
+ const user_manager::UserID& user_id = (*user)->GetUserID();
+ if (connector->GetUserAffiliation(user_id) == USER_AFFILIATION_MANAGED) {
device_user->set_type(em::DeviceUser::USER_TYPE_MANAGED);
- device_user->set_email(email);
+ device_user->set_email(user_id.GetUserEmail());
} else {
device_user->set_type(em::DeviceUser::USER_TYPE_UNMANAGED);
// Do not report the email address of unmanaged users.

Powered by Google App Engine
This is Rietveld 408576698