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

Unified Diff: ash/system/date/date_default_view.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/date/date_default_view.cc
diff --git a/ash/system/date/date_default_view.cc b/ash/system/date/date_default_view.cc
index f9ed12309b27b00aab93d403d9e557d7c560b064..851494309709b59c4559566a53e733240d368d69 100644
--- a/ash/system/date/date_default_view.cc
+++ b/ash/system/date/date_default_view.cc
@@ -42,8 +42,12 @@ DateDefaultView::DateDefaultView(ash::user::LoginStatus login)
view->SetContent(date_view_);
AddChildView(view);
- if (login == ash::user::LOGGED_IN_LOCKED ||
- login == ash::user::LOGGED_IN_NONE)
+ bool userAddingRunning =
+ (ash::Shell::GetInstance()->session_state_delegate()->GetSessionState() ==
+ ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY);
+
+ if (login == user::LOGGED_IN_LOCKED ||
+ login == user::LOGGED_IN_NONE || userAddingRunning)
return;
date_view_->SetAction(TrayDate::SHOW_DATE_SETTINGS);

Powered by Google App Engine
This is Rietveld 408576698