Index: ash/common/system/web_notification/web_notification_tray.cc |
diff --git a/ash/common/system/web_notification/web_notification_tray.cc b/ash/common/system/web_notification/web_notification_tray.cc |
index 9109408945a3b330263d8ba4c148d3f5f992b8e2..a0afe3397eaaa07a30ba9558ec24a1d847752d84 100644 |
--- a/ash/common/system/web_notification/web_notification_tray.cc |
+++ b/ash/common/system/web_notification/web_notification_tray.cc |
@@ -515,9 +515,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(); |
} |