MD Settings: CrOS: Users: Fix names

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>
 
 #include "base/memory/ptr_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/extensions/users_private/users_private_delegate.h"
 #include "chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
@@ skipping 70 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);
-    user.name =
-        user_manager->GetUserDisplayEmail(AccountId::FromUserEmail(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.

[michaelpg, 2017/04/06 14:50:29]

what cases don't have gaia accounts or display names?

[stevenjb, 2017/04/06 16:27:58]

I'm not really sure, just making sure we are consistent with previous behavior.
In theory it is possible to log into chromiumos with a non google account,
although I don't know whether that has been implemented in practice.

+      user.name = user_manager->GetUserDisplayEmail(account_id);
+    }
     user.is_owner = chromeos::ProfileHelper::IsOwnerProfile(profile) &&
                     user.email == profile->GetProfileUserName();
     user_list->Append(user.ToValue());
   }
 
   return RespondNow(OneArgument(std::move(user_list)));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // UsersPrivateAddWhitelistedUserFunction
@@ skipping 100 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