diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-14 23:48:30 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-14 23:48:30 +0000 |
| commit | d66eac44cda6b48f70bf6ef06adc72c8638b39bf (patch) | |
| tree | f0f59465b920eb98baf01219d4d36df47822644a /ash/system/user/accounts_detailed_view.cc | |
| parent | dae74c14f2a4543d900e0e5e37632ed111a08ffe (diff) | |
| download | chromium_src-d66eac44cda6b48f70bf6ef06adc72c8638b39bf.zip chromium_src-d66eac44cda6b48f70bf6ef06adc72c8638b39bf.tar.gz chromium_src-d66eac44cda6b48f70bf6ef06adc72c8638b39bf.tar.bz2 | |
Move UserInfo to user_manager.
Since user_manager::UserInfo is used on non-chromeos ash implementation, defined part of user_manager component that is included on cross-platform ash.
BUG=387614
Review URL: https://codereview.chromium.org/379803004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/user/accounts_detailed_view.cc')
| -rw-r--r-- | ash/system/user/accounts_detailed_view.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/system/user/accounts_detailed_view.cc b/ash/system/user/accounts_detailed_view.cc index 5b78a76..393f8d5 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(); |