Settings People CrOS: Display supervised users' names correctly.

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 64 matching lines @@
   for (size_t i = 0; i < email_list->GetSize(); ++i) {
     std::string whitelisted_user;
     email_list->GetString(i, &whitelisted_user);
     if (gaia::ExtractDomainName(whitelisted_user) ==
         chromeos::login::kSupervisedUserDomain) {
       email_list->Remove(i, NULL);
       --i;
     }
   }
 
-  const user_manager::UserList& users =
-      user_manager::UserManager::Get()->GetUsers();
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
+  const user_manager::UserList& users = user_manager->GetUsers();
   for (user_manager::UserList::const_iterator it = users.begin();
        it < users.end(); ++it)
     email_list->AppendIfNotPresent(new base::StringValue((*it)->email()));
 
   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);
-
+    user.name =
+        user_manager->GetUserDisplayEmail(AccountId::FromUserEmail(user.email));
     user.is_owner = chromeos::ProfileHelper::IsOwnerProfile(profile) &&
                     user.email == profile->GetProfileUserName();
     user_list->Append(user.ToValue().release());
   }
 
   return RespondNow(OneArgument(std::move(user_list)));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // UsersPrivateAddWhitelistedUserFunction
@@ skipping 107 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::FundamentalValue>(is_managed)));
 }
 
 }  // namespace extensions