| Index: ash/system/user/accounts_detailed_view.cc
|
| diff --git a/ash/system/user/accounts_detailed_view.cc b/ash/system/user/accounts_detailed_view.cc
|
| index 5b78a766dbb34e1f2806fd0b785df3c97995f65c..393f8d58fa620d2ee96612b2cb87366ec2480c20 100644
|
| --- a/ash/system/user/accounts_detailed_view.cc
|
| +++ b/ash/system/user/accounts_detailed_view.cc
|
| @@ -7,7 +7,6 @@
|
| #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"
|
| @@ -18,6 +17,7 @@
|
| #include "ash/system/user/config.h"
|
| #include "ash/system/user/tray_user.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "components/user_manager/user_info.h"
|
| #include "grit/ash_resources.h"
|
| #include "grit/ui_resources.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| @@ -120,7 +120,8 @@ void AccountsDetailedView::AddAddAccountButton() {
|
| SessionStateDelegate* session_state_delegate =
|
| Shell::GetInstance()->session_state_delegate();
|
| HoverHighlightView* add_account_button = new HoverHighlightView(this);
|
| - const UserInfo* user_info = session_state_delegate->GetUserInfo(0);
|
| + const user_manager::UserInfo* user_info =
|
| + session_state_delegate->GetUserInfo(0);
|
| base::string16 user_name = user_info->GetGivenName();
|
| if (user_name.empty())
|
| user_name = user_info->GetDisplayName();
|
|
|