MD Settings: user list fixes

chrome/browser/chromeos/extensions/users_private/users_private_api.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/extensions/users_private/users_private_api.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 80 matching lines @@
   }
 
   if (chromeos::OwnerSettingsServiceChromeOS* service =
           chromeos::OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(
               profile)) {
     service->Set(chromeos::kAccountsPrefUsers, *email_list.get());
   }
 
   // Now populate the list of User objects for returning to the JS.
   for (size_t i = 0; i < email_list->GetSize(); ++i) {
-    api::users_private::User user;
-    email_list->GetString(i, &user.email);
-    AccountId account_id = AccountId::FromUserEmail(user.email);
-    user.name = base::UTF16ToUTF8(user_manager->GetUserDisplayName(account_id));
-    if (user.name.empty()) {
-      // User is not associated with a gaia account.
-      user.name = user_manager->GetUserDisplayEmail(account_id);
+    std::string email;
+    email_list->GetString(i, &email);
+    AccountId account_id = AccountId::FromUserEmail(email);
+    const user_manager::User* user = user_manager->FindUser(account_id);
+    api::users_private::User api_user;
+    if (user) {
+      api_user.email = user->GetDisplayEmail();
+      api_user.name = base::UTF16ToUTF8(user->GetDisplayName());
+      api_user.is_owner =
+          user->GetAccountId() == user_manager->GetOwnerAccountId();
+      api_user.is_supervised = user->IsSupervised();
+    } else {
+      // User is unknown (i.e. not on device).
+      api_user.email = email;
+      api_user.name = email;
+      api_user.is_owner = false;
+      api_user.is_supervised = false;
     }
-    user.is_owner = chromeos::ProfileHelper::IsOwnerProfile(profile) &&
-                    user.email == profile->GetProfileUserName();
-    user_list->Append(user.ToValue());
+    user_list->Append(api_user.ToValue());
   }
 
   return RespondNow(OneArgument(std::move(user_list)));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // UsersPrivateAddWhitelistedUserFunction
 
 UsersPrivateAddWhitelistedUserFunction::UsersPrivateAddWhitelistedUserFunction()
     : chrome_details_(this) {
@@ skipping 97 matching lines @@
 
 ExtensionFunction::ResponseAction
 UsersPrivateIsWhitelistManagedFunction::Run() {
   bool is_managed = g_browser_process->platform_part()
                         ->browser_policy_connector_chromeos()
                         ->IsEnterpriseManaged();
   return RespondNow(OneArgument(base::MakeUnique<base::Value>(is_managed)));
 }
 
 }  // namespace extensions