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: |