Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2319)

Unified Diff: ash/system/chromeos/session/logout_button_tray.cc

Issue 357323002: Tray elements behave appropriately on the multiple signin screen (more like lock screen) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Stored result of check on multiple signin screen to local variable Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698