diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 04:53:27 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 04:53:27 +0000 |
| commit | 1247dd88c45fea18fc2b0b79248d677fa741f45d (patch) | |
| tree | 9ee4da1dddb3a1763863b0ae69a8dda539f80a03 /ash/system/user | |
| parent | a5a00b77180a37162e7b78f0cf9392e8b43eeac9 (diff) | |
| download | chromium_src-1247dd88c45fea18fc2b0b79248d677fa741f45d.zip chromium_src-1247dd88c45fea18fc2b0b79248d677fa741f45d.tar.gz chromium_src-1247dd88c45fea18fc2b0b79248d677fa741f45d.tar.bz2 | |
ash: Using ScreenLocker from PowerManagerClient::Observer::LockScreen is not safe.
Instead of using ScreenLocker, keep a boolean flag to decide whether or not the
screen is locked.
BUG=120087
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9773013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/user')
| -rw-r--r-- | ash/system/user/tray_user.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc index e09b711..bab29cb 100644 --- a/ash/system/user/tray_user.cc +++ b/ash/system/user/tray_user.cc @@ -360,7 +360,8 @@ TrayUser::~TrayUser() { views::View* TrayUser::CreateTrayView(user::LoginStatus status) { avatar_.reset(new tray::RoundedImageView(kUserIconCornerRadius)); - if (status == user::LOGGED_IN_USER || status == user::LOGGED_IN_OWNER) { + if (status != user::LOGGED_IN_NONE && status != user::LOGGED_IN_KIOSK && + status != user::LOGGED_IN_GUEST) { avatar_->SetImage( ash::Shell::GetInstance()->tray_delegate()->GetUserImage(), gfx::Size(kUserIconSize, kUserIconSize)); |