Index: ash/system/chromeos/session/logout_button_tray.cc |
diff --git a/ash/system/chromeos/session/logout_button_tray.cc b/ash/system/chromeos/session/logout_button_tray.cc |
index ffd322a0b0565a5bb2d1e0f8959aad32c94449d7..892121455e20276487b32ad2988201e371d20f99 100644 |
--- a/ash/system/chromeos/session/logout_button_tray.cc |
+++ b/ash/system/chromeos/session/logout_button_tray.cc |
@@ -4,6 +4,7 @@ |
#include "ash/system/chromeos/session/logout_button_tray.h" |
+#include "ash/session/session_state_delegate.h" |
#include "ash/shelf/shelf_types.h" |
#include "ash/shell.h" |
#include "ash/system/chromeos/session/logout_confirmation_controller.h" |
@@ -157,9 +158,11 @@ void LogoutButtonTray::UpdateAfterLoginStatusChange( |
} |
void LogoutButtonTray::UpdateVisibility() { |
- SetVisible(show_logout_button_in_tray_ && |
- login_status_ != user::LOGGED_IN_NONE && |
- login_status_ != user::LOGGED_IN_LOCKED); |
+ SetVisible( |
+ show_logout_button_in_tray_ && login_status_ != user::LOGGED_IN_NONE && |
+ login_status_ != user::LOGGED_IN_LOCKED && |
+ ash::Shell::GetInstance()->session_state_delegate()->GetSessionState() != |
+ ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY); |
} |
} // namespace ash |