| 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..d8cafb9668bde9ad1ad1b2087fff72b8b2caa12c 100644
|
| --- a/ash/system/chromeos/tray_display.cc
|
| +++ b/ash/system/chromeos/tray_display.cc
|
| @@ -122,7 +122,10 @@ void OpenSettings() {
|
| case user::LOGGED_IN_PUBLIC:
|
| case user::LOGGED_IN_SUPERVISED:
|
| case user::LOGGED_IN_KIOSK_APP:
|
| - Shell::GetInstance()->system_tray_delegate()->ShowDisplaySettings();
|
| + ash::SystemTrayDelegate* delegate =
|
| + Shell::GetInstance()->system_tray_delegate();
|
| + if (delegate->ShouldShowSettings())
|
| + delegate->ShowDisplaySettings();
|
| }
|
| }
|
|
|
|
|