Chromium Code Reviews| 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..754b3aaf972818f5e10d5d1f0219c6a0e07da1e1 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,13 @@ void LogoutButtonTray::UpdateAfterLoginStatusChange( |
| } |
| void LogoutButtonTray::UpdateVisibility() { |
| + bool userAddingRunning = |
| + (ash::Shell::GetInstance()->session_state_delegate()->GetSessionState() == |
| + ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY); |
| + |
| SetVisible(show_logout_button_in_tray_ && |
| login_status_ != user::LOGGED_IN_NONE && |
| - login_status_ != user::LOGGED_IN_LOCKED); |
| + login_status_ != user::LOGGED_IN_LOCKED && !userAddingRunning); |
|
oshima
2014/08/01 20:31:22
does secondary login screen have a sign out out bu
Roman Sorokin (ftl)
2014/08/05 13:44:09
Turned out this is button for public sessions so d
|
| } |
| } // namespace ash |