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

Unified Diff: ash/system/tray/tray_popup_utils.cc

Issue 2821363002: cros: Disable system tray help/lock buttons during supervised user creation (Closed)
Patch Set: fix browser test Created 3 years, 8 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/tray/tray_popup_utils.h ('k') | ash/system/tray_accessibility.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_popup_utils.cc
diff --git a/ash/system/tray/tray_popup_utils.cc b/ash/system/tray/tray_popup_utils.cc
index 64fa187d8799c7f3d2df3b985eed1bd28d7ac848..c2d5237d92fcfe072bc2f948afac515501afd9c2 100644
--- a/ash/system/tray/tray_popup_utils.cc
+++ b/ash/system/tray/tray_popup_utils.cc
@@ -427,13 +427,8 @@ views::Separator* TrayPopupUtils::CreateListSubHeaderSeparator() {
return separator;
}
-bool TrayPopupUtils::CanOpenWebUISettings(LoginStatus status) {
- // TODO(tdanderson): Consider moving this into ShellPort, or introduce a
- // CanShowSettings() method in each delegate type that has a
- // ShowSettings() method.
- return status != LoginStatus::NOT_LOGGED_IN &&
- status != LoginStatus::LOCKED &&
- !Shell::Get()->session_controller()->IsInSecondaryLoginScreen();
+bool TrayPopupUtils::CanOpenWebUISettings() {
+ return Shell::Get()->session_controller()->ShouldEnableSettings();
}
void TrayPopupUtils::InitializeAsCheckableRow(HoverHighlightView* container,
« no previous file with comments | « ash/system/tray/tray_popup_utils.h ('k') | ash/system/tray_accessibility.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698