cros: Pull user info from session_controller_client.mojom into separate mojom.

ash/system/user/user_card_view.cc

 // Copyright 2014 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 "ash/system/user/user_card_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
@@ skipping 47 matching lines @@
 const base::char16 kDisplayNameMark[] = {0x2060, 0};
 
 views::View* CreateUserAvatarView(LoginStatus login_status, int user_index) {
   RoundedImageView* image_view = new RoundedImageView(kTrayItemSize / 2);
   if (login_status == LoginStatus::GUEST) {
     gfx::ImageSkia icon =
         gfx::CreateVectorIcon(kSystemMenuGuestIcon, kMenuIconColor);
     image_view->SetImage(icon, icon.size());
   } else {
     SessionController* controller = Shell::Get()->session_controller();
-    image_view->SetImage(controller->GetUserSession(user_index)->avatar,
-                         gfx::Size(kTrayItemSize, kTrayItemSize));
+    image_view->SetImage(
+        controller->GetUserSession(user_index)->user_info->avatar,
+        gfx::Size(kTrayItemSize, kTrayItemSize));
   }
 
   image_view->SetBorder(views::CreateEmptyBorder(gfx::Insets(
       (kTrayPopupItemMinStartWidth - image_view->GetPreferredSize().width()) /
       2)));
   return image_view;
 }
 
 // The user details shown in public account mode. This is essentially a label
 // but with custom painting code as the text is styled with multiple colors and
@@ skipping 29 matching lines @@
   const int inner_padding =
       kTrayPopupPaddingHorizontal - kTrayPopupPaddingBetweenItems;
   const bool rtl = base::i18n::IsRTL();
   SetBorder(views::CreateEmptyBorder(
       kUserDetailsVerticalPadding, rtl ? 0 : inner_padding,
       kUserDetailsVerticalPadding, rtl ? inner_padding : 0));
 
   // Retrieve the user's display name and wrap it with markers.
   // Note that since this is a public account it always has to be the primary
   // user.
-  base::string16 display_name = base::UTF8ToUTF16(
-      Shell::Get()->session_controller()->GetUserSession(0)->display_name);
+  base::string16 display_name =
+      base::UTF8ToUTF16(Shell::Get()
+                            ->session_controller()
+                            ->GetUserSession(0)
+                            ->user_info->display_name);
   base::RemoveChars(display_name, kDisplayNameMark, &display_name);
   display_name = kDisplayNameMark[0] + display_name + kDisplayNameMark[0];
   // Retrieve the domain managing the device and wrap it with markers.
   base::string16 domain = base::UTF8ToUTF16(
       Shell::Get()->system_tray_controller()->enterprise_domain());
   base::RemoveChars(domain, kDisplayNameMark, &domain);
   base::i18n::WrapStringWithLTRFormatting(&domain);
   // Retrieve the label text, inserting the display name and domain.
   text_ = l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_PUBLIC_LABEL,
                                      display_name, domain);
@@ skipping 244 matching lines @@
   AddChildView(new PublicAccountUserDetails());
 }
 
 void UserCardView::AddUserContent(views::BoxLayout* layout,
                                   LoginStatus login_status) {
   AddChildView(CreateUserAvatarView(login_status, user_index_));
   SessionController* controller = Shell::Get()->session_controller();
   base::string16 user_name_string =
       login_status == LoginStatus::GUEST
           ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_GUEST_LABEL)
-          : base::UTF8ToUTF16(
-                controller->GetUserSession(user_index_)->display_name);
+          : base::UTF8ToUTF16(controller->GetUserSession(user_index_)
+                                  ->user_info->display_name);
   user_name_ = new views::Label(user_name_string);
   user_name_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   TrayPopupItemStyle user_name_style(
       TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
   user_name_style.SetupLabel(user_name_);
 
   TrayPopupItemStyle user_email_style(TrayPopupItemStyle::FontStyle::CAPTION);
   user_email_style.set_color_style(TrayPopupItemStyle::ColorStyle::INACTIVE);
   auto* user_email = new views::Label();
   base::string16 user_email_string;
   if (login_status != LoginStatus::GUEST) {
     user_email_string =
         Shell::Get()->session_controller()->IsUserSupervised()
             ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL)
-            : base::UTF8ToUTF16(
-                  controller->GetUserSession(user_index_)->display_email);
+            : base::UTF8ToUTF16(controller->GetUserSession(user_index_)
+                                    ->user_info->display_email);
   }
   user_email->SetText(user_email_string);
   user_email->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   user_email_style.SetupLabel(user_email);
   user_email->SetVisible(!user_email_string.empty());
   user_email->set_collapse_when_hidden(true);
 
   views::View* stack_of_labels = new views::View;
   AddChildView(stack_of_labels);
   layout->SetFlexForView(stack_of_labels, 1);
@@ skipping 22 matching lines @@
   media_capture_container_ = new views::View();
   media_capture_container_->SetLayoutManager(new views::FillLayout());
   media_capture_container_->AddChildView(media_capture_icon_);
   AddChildView(media_capture_container_);
 
   Shell::Get()->media_controller()->RequestCaptureState();
 }
 
 }  // namespace tray
 }  // namespace ash