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

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: Update after review Created 6 years, 4 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
« no previous file with comments | « ash/system/chromeos/settings/tray_settings.cc ('k') | ash/system/date/date_default_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
}
« no previous file with comments | « ash/system/chromeos/settings/tray_settings.cc ('k') | ash/system/date/date_default_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698