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 /chrome/browser/ui/views/frame/system_menu_model_builder.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 'chrome/browser/ui/views/frame/system_menu_model_builder.cc')
| -rw-r--r-- | chrome/browser/ui/views/frame/system_menu_model_builder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/frame/system_menu_model_builder.cc b/chrome/browser/ui/views/frame/system_menu_model_builder.cc index 44dacd8..9848722 100644 --- a/chrome/browser/ui/views/frame/system_menu_model_builder.cc +++ b/chrome/browser/ui/views/frame/system_menu_model_builder.cc @@ -17,11 +17,11 @@ #if defined(OS_CHROMEOS) #include "ash/session/session_state_delegate.h" -#include "ash/session/user_info.h" #include "ash/shell.h" #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" #include "chrome/browser/ui/browser_window.h" +#include "components/user_manager/user_info.h" #include "ui/base/l10n/l10n_util.h" #endif @@ -152,7 +152,7 @@ void SystemMenuModelBuilder::AppendTeleportMenu(ui::SimpleMenuModel* model) { model->AddSeparator(ui::NORMAL_SEPARATOR); DCHECK(logged_in_users <= 3); for (int user_index = 1; user_index < logged_in_users; ++user_index) { - const ash::UserInfo* user_info = delegate->GetUserInfo(user_index); + const user_manager::UserInfo* user_info = delegate->GetUserInfo(user_index); model->AddItem( user_index == 1 ? IDC_VISIT_DESKTOP_OF_LRU_USER_2 : IDC_VISIT_DESKTOP_OF_LRU_USER_3, |