From 1247dd88c45fea18fc2b0b79248d677fa741f45d Mon Sep 17 00:00:00 2001 From: "sadrul@chromium.org" Date: Mon, 26 Mar 2012 04:53:27 +0000 Subject: 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 --- ash/system/user/tray_user.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ash/system/user') 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)); -- cgit v1.1