MD Settings: Cros Users: Use display name for non gaia accounts

chrome/browser/ui/webui/settings/profile_info_handler.cc

 // Copyright 2016 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/ui/webui/settings/profile_info_handler.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_attributes_entry.h"
 #include "chrome/browser/ui/user_manager.h"
 #include "chrome/common/pref_names.h"
 #include "ui/base/webui/web_ui_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_service.h"
 #else
-#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_statistics.h"
 #include "chrome/browser/profiles/profile_statistics_factory.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #endif
 
 namespace settings {
 
 // static
 const char ProfileInfoHandler::kProfileInfoChangedEventName[] =
@@ skipping 147 matching lines @@
       base::FundamentalValue(IsProfileManagingSupervisedUsers()));
 }
 
 std::unique_ptr<base::DictionaryValue>
 ProfileInfoHandler::GetAccountNameAndIcon() const {
   std::string name;
   std::string icon_url;
 
 #if defined(OS_CHROMEOS)
   name = profile_->GetProfileUserName();
+  std::string user_email;
   if (name.empty()) {
+    // User is not associated with a gaia account, use the display name.
     const user_manager::User* user =
         chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
-    if (user && (user->GetType() != user_manager::USER_TYPE_GUEST))
-      name = user->GetAccountId().GetUserEmail();
+    // Note: We don't show the User section in Guest mode.
+    DCHECK(user && (user->GetType() != user_manager::USER_TYPE_GUEST));
+    name = base::UTF16ToUTF8(user->GetDisplayName());
+    user_email = user->GetAccountId().GetUserEmail();
+  } else {
+    name = gaia::SanitizeEmail(gaia::CanonicalizeEmail(name));
+    user_email = name;
   }
-  if (!name.empty())
-    name = gaia::SanitizeEmail(gaia::CanonicalizeEmail(name));
 
   // Get image as data URL instead of using chrome://userimage source to avoid
   // issues with caching.
-  const AccountId account_id(AccountId::FromUserEmail(name));
+  const AccountId account_id(AccountId::FromUserEmail(user_email));
   scoped_refptr<base::RefCountedMemory> image =
       chromeos::options::UserImageSource::GetUserImage(account_id);
   icon_url = webui::GetPngDataUrl(image->front(), image->size());
 #else   // !defined(OS_CHROMEOS)
   ProfileAttributesEntry* entry;
   if (g_browser_process->profile_manager()
           ->GetProfileAttributesStorage()
           .GetProfileAttributesWithPath(profile_->GetPath(), &entry)) {
     name = base::UTF16ToUTF8(entry->GetName());
 
@@ skipping 11 matching lines @@
   response->SetString("name", name);
   response->SetString("iconUrl", icon_url);
   return base::WrapUnique(response);
 }
 
 bool ProfileInfoHandler::IsProfileManagingSupervisedUsers() const {
   return !profile_->GetPrefs()->GetDictionary(prefs::kSupervisedUsers)->empty();
 }
 
 }  // namespace settings