CleanUp: Introduce UserInfo. Move session_state stuff to ash/session.

ash/system/user/accounts_detailed_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/accounts_detailed_view.h"
 
 #include <vector>
 
 #include "ash/multi_profile_uma.h"
+#include "ash/session/user_info.h"
 #include "ash/shell.h"
 #include "ash/system/tray/fixed_sized_scroll_view.h"
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_header_button.h"
 #include "ash/system/user/config.h"
 #include "ash/system/user/tray_user.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 16 matching lines @@
 
 }  // namespace
 
 AccountsDetailedView::AccountsDetailedView(TrayUser* owner,
                                            user::LoginStatus login_status)
     : TrayDetailsView(owner),
       delegate_(NULL),
       account_list_(NULL),
       add_account_button_(NULL),
       add_user_button_(NULL) {
-  std::string user_id =
-      Shell::GetInstance()->session_state_delegate()->GetUserID(0);
+  std::string user_id = Shell::GetInstance()
+                            ->session_state_delegate()
+                            ->GetUserInfo(0)
+                            ->GetUserID();
   delegate_ =
       Shell::GetInstance()->system_tray_delegate()->GetUserAccountsDelegate(
           user_id);
   delegate_->AddObserver(this);
   AddHeader(login_status);
   CreateScrollableList();
   AddAccountList();
   AddAddAccountButton();
   AddFooter();
 }
@@ skipping 52 matching lines @@
   scroll_content()->AddChildView(account_list_title);
   account_list_ = new views::View();
   UpdateAccountList();
   scroll_content()->AddChildView(account_list_);
 }
 
 void AccountsDetailedView::AddAddAccountButton() {
   SessionStateDelegate* session_state_delegate =
       Shell::GetInstance()->session_state_delegate();
   HoverHighlightView* add_account_button = new HoverHighlightView(this);
-  base::string16 user_name = session_state_delegate->GetUserGivenName(0);
+  const UserInfo* user_info = session_state_delegate->GetUserInfo(0);
+  base::string16 user_name = user_info->GetGivenName();
   if (user_name.empty())
-    user_name = session_state_delegate->GetUserDisplayName(0);
+    user_name = user_info->GetDisplayName();
   if (user_name.empty())
-    user_name = base::ASCIIToUTF16(session_state_delegate->GetUserEmail(0));
+    user_name = base::ASCIIToUTF16(user_info->GetEmail());
   add_account_button->AddLabel(
       l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_ADD_ACCOUNT_LABEL,
                                  user_name),
       gfx::ALIGN_CENTER,
       gfx::Font::NORMAL);
   AddChildView(add_account_button);
   add_account_button_ = add_account_button;
 }
 
 void AccountsDetailedView::AddFooter() {
@@ skipping 83 matching lines @@
                           rb.GetImageNamed(IDR_CLOSE_2).ToImageSkia());
   delete_button->SetImage(views::Button::STATE_HOVERED,
                           rb.GetImageNamed(IDR_CLOSE_2_H).ToImageSkia());
   delete_button->SetImage(views::Button::STATE_PRESSED,
                           rb.GetImageNamed(IDR_CLOSE_2_P).ToImageSkia());
   return delete_button;
 }
 
 }  // namespace tray
 }  // namespace ash