Index: ash/system/user/tray_user.cc |
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc |
index cb8629877e9f1755624a3f4b757d9261cdd1e749..9851ba15a0f05f9047272930420aa5f5ff62a9ec 100644 |
--- a/ash/system/user/tray_user.cc |
+++ b/ash/system/user/tray_user.cc |
@@ -93,8 +93,11 @@ views::View* TrayUser::CreateDefaultView(user::LoginStatus status) { |
const SessionStateDelegate* session_state_delegate = |
Shell::GetInstance()->session_state_delegate(); |
- // If the screen is locked show only the currently active user. |
- if (multiprofile_index_ && session_state_delegate->IsUserSessionBlocked()) |
+ // If the screen is locked or a system modal dialog box is shown, show only |
+ // the currently active user. |
+ if (multiprofile_index_ && |
+ (session_state_delegate->IsUserSessionBlocked() || |
+ Shell::GetInstance()->IsSystemModalWindowOpen())) |
return NULL; |
CHECK(user_ == NULL); |