ash: Use SessionController instead of SessionStateDelegate

ash/common/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/common/system/user/user_card_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
 #include "ash/common/ash_view_ids.h"
 #include "ash/common/login_status.h"
 #include "ash/common/media_controller.h"
-#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/user/rounded_image_view.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/ptr_util.h"
@@ skipping 31 matching lines @@
 // and end of the user's display name in the public account user card's text.
 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 {
-    SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate();
-    image_view->SetImage(delegate->GetUserInfo(user_index)->GetImage(),
+    SessionController* controller = WmShell::Get()->session_controller();
+    image_view->SetImage(gfx::ImageSkia::CreateFrom1xBitmap(

[James Cook, 2017/03/17 17:14:35]

ditto re high dpi

[xiyuan, 2017/03/17 22:52:02]

Acknowledged.

+                             controller->GetUserSession(user_index)->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
@@ skipping 33 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 = WmShell::Get()
-                                    ->GetSessionStateDelegate()
-                                    ->GetUserInfo(0)
-                                    ->GetDisplayName();
+  base::string16 display_name = base::UTF8ToUTF16(
+      WmShell::Get()->session_controller()->GetUserSession(0)->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(
       WmShell::Get()->system_tray_delegate()->GetEnterpriseDomain());
   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 253 matching lines @@
   views::View* avatar = CreateUserAvatarView(LoginStatus::PUBLIC, 0);
   AddChildView(avatar);
   int details_max_width = max_width - avatar->GetPreferredSize().width() -
                           kTrayPopupPaddingBetweenItems;
   AddChildView(new PublicAccountUserDetails(details_max_width));
 }
 
 void UserCardView::AddUserContent(views::BoxLayout* layout,
                                   LoginStatus login_status) {
   AddChildView(CreateUserAvatarView(login_status, user_index_));
-  SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate();
+  SessionController* controller = WmShell::Get()->session_controller();
   base::string16 user_name_string =
       login_status == LoginStatus::GUEST
           ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_GUEST_LABEL)
-          : delegate->GetUserInfo(user_index_)->GetDisplayName();
+          : base::UTF8ToUTF16(
+                controller->GetUserSession(user_index_)->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);
   // Only the active user's email label is lightened (for the inactive user, the
   // label starts as black and the entire row is 54% opacity).
   if (is_active_user())
     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 =
         WmShell::Get()->system_tray_delegate()->IsUserSupervised()
             ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL)
             : base::UTF8ToUTF16(
-                  delegate->GetUserInfo(user_index_)->GetDisplayEmail());
+                  controller->GetUserSession(user_index_)->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 29 matching lines @@
 
     media_capture_icon_->set_id(VIEW_ID_USER_VIEW_MEDIA_INDICATOR);
     AddChildView(media_capture_icon_);
 
     WmShell::Get()->media_controller()->RequestCaptureState();
   }
 }
 
 }  // namespace tray
 }  // namespace ash