Commit 198e264e authored by warx's avatar warx Committed by Commit bot

Hide web notification tray when LoginStatus is locked

BUG=625357
TEST=manual test: locked screen state will see web notification tray be hidden and shown when logged in

Review-Url: https://codereview.chromium.org/2120033002
Cr-Commit-Position: refs/heads/master@{#403955}
parent f0e606a5
......@@ -516,9 +516,9 @@ message_center::MessageCenter* WebNotificationTray::message_center() const {
bool WebNotificationTray::IsLoggedIn() const {
WmShell* shell = WmShell::Get();
// TODO(jamescook): Should this also check LoginState::LOCKED?
return shell->system_tray_delegate()->GetUserLoginStatus() !=
LoginStatus::NOT_LOGGED_IN &&
LoginStatus status = shell->system_tray_delegate()->GetUserLoginStatus();
return status != LoginStatus::NOT_LOGGED_IN &&
status != LoginStatus::LOCKED &&
!shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment