diff options
Diffstat (limited to 'ash/system/user/accounts_detailed_view.cc')
| -rw-r--r-- | ash/system/user/accounts_detailed_view.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/ash/system/user/accounts_detailed_view.cc b/ash/system/user/accounts_detailed_view.cc index fe5bb68..58956b5 100644 --- a/ash/system/user/accounts_detailed_view.cc +++ b/ash/system/user/accounts_detailed_view.cc @@ -7,6 +7,7 @@ #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" @@ -43,8 +44,10 @@ AccountsDetailedView::AccountsDetailedView(TrayUser* owner, 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); @@ -117,11 +120,12 @@ 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), |