diff options
| author | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-06 17:22:31 +0000 |
|---|---|---|
| committer | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-06 17:22:31 +0000 |
| commit | 5f6165cb8bb831f01f187e8ef3c7596e7b7403b9 (patch) | |
| tree | 3736342851d60fa20ee2481577cda4f3f541c750 /ash/system | |
| parent | 5d1462786d9584a9b1254684aa6d61ac18cc98ce (diff) | |
| download | chromium_src-5f6165cb8bb831f01f187e8ef3c7596e7b7403b9.zip chromium_src-5f6165cb8bb831f01f187e8ef3c7596e7b7403b9.tar.gz chromium_src-5f6165cb8bb831f01f187e8ef3c7596e7b7403b9.tar.bz2 | |
Make ash aware of public accounts
This CL propagates the information that the user is logged into a public
account to ash and adds an appropriate label for the sign-out button.
BUG=152929
BUG=152928
Review URL: https://chromiumcodereview.appspot.com/11273120
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/user/login_status.cc | 3 | ||||
| -rw-r--r-- | ash/system/user/login_status.h | 1 | ||||
| -rw-r--r-- | ash/system/user/tray_user.cc | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/ash/system/user/login_status.cc b/ash/system/user/login_status.cc index d24185d..b876e49 100644 --- a/ash/system/user/login_status.cc +++ b/ash/system/user/login_status.cc @@ -19,6 +19,9 @@ string16 GetLocalizedSignOutStringForStatus(LoginStatus status) { case LOGGED_IN_KIOSK: message_id = IDS_ASH_STATUS_TRAY_EXIT_KIOSK; break; + case LOGGED_IN_PUBLIC: + message_id = IDS_ASH_STATUS_TRAY_EXIT_PUBLIC; + break; default: message_id = IDS_ASH_STATUS_TRAY_SIGN_OUT; break; diff --git a/ash/system/user/login_status.h b/ash/system/user/login_status.h index 0d470d2..13bdc48 100644 --- a/ash/system/user/login_status.h +++ b/ash/system/user/login_status.h @@ -16,6 +16,7 @@ enum LoginStatus { LOGGED_IN_OWNER, // The owner of the device is logged in. LOGGED_IN_GUEST, // A guest is logged in (i.e. incognito) LOGGED_IN_KIOSK, // Is in kiosk mode. + LOGGED_IN_PUBLIC, // A public account is logged in. LOGGED_IN_NONE, // Not logged in. }; diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc index b291296..7cf0566 100644 --- a/ash/system/user/tray_user.cc +++ b/ash/system/user/tray_user.cc @@ -296,6 +296,7 @@ void TrayUser::UpdateAfterLoginStatusChange(user::LoginStatus status) { case user::LOGGED_IN_LOCKED: case user::LOGGED_IN_USER: case user::LOGGED_IN_OWNER: + case user::LOGGED_IN_PUBLIC: avatar_->SetImage( ash::Shell::GetInstance()->tray_delegate()->GetUserImage(), gfx::Size(kUserIconSize, kUserIconSize)); |