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