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

Unified Diff: ash/system/chromeos/tray_display.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/tray_display.cc
diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc
index d1fca840b306824d4b9d3f5caa81f5400a5f7b7c..ac32002cab11e6841abbcd3bd99a98135d20250d 100644
--- a/ash/system/chromeos/tray_display.cc
+++ b/ash/system/chromeos/tray_display.cc
@@ -6,6 +6,7 @@
#include "ash/display/display_controller.h"
#include "ash/display/display_manager.h"
+#include "ash/session/session_state_delegate.h"
#include "ash/shell.h"
#include "ash/system/system_notifier.h"
#include "ash/system/tray/actionable_view.h"
@@ -110,6 +111,10 @@ base::string16 GetAllDisplayInfo() {
void OpenSettings() {
// switch is intentionally introduced without default, to cause an error when
// a new type of login status is introduced.
+ if (ash::Shell::GetInstance()->session_state_delegate()->GetSessionState() ==
+ ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY)
+ return;
oshima 2014/08/01 20:31:22 Do you need this? If you do, can you use ShouldSho
Roman Sorokin (ftl) 2014/08/05 13:44:09 Done.
+
switch (Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus()) {
case user::LOGGED_IN_NONE:
case user::LOGGED_IN_LOCKED:

Powered by Google App Engine
This is Rietveld 408576698