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

Unified Diff: ash/system/tray/tray_details_view.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_details_view.h ('k') | ash/system/tray/tray_popup_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_details_view.cc
diff --git a/ash/system/tray/tray_details_view.cc b/ash/system/tray/tray_details_view.cc
index 9ae56da2b127dd9202d3bba004b5729f7b482598..fee3c723c106d63cc1454d702929a9e98886fbf6 100644
--- a/ash/system/tray/tray_details_view.cc
+++ b/ash/system/tray/tray_details_view.cc
@@ -326,21 +326,21 @@ void TrayDetailsView::ShowProgress(double value, bool visible) {
}
views::CustomButton* TrayDetailsView::CreateSettingsButton(
- LoginStatus status,
int setting_accessible_name_id) {
SystemMenuButton* button =
new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED,
kSystemMenuSettingsIcon, setting_accessible_name_id);
- if (!TrayPopupUtils::CanOpenWebUISettings(status))
+ if (!TrayPopupUtils::CanOpenWebUISettings())
button->SetEnabled(false);
return button;
}
-views::CustomButton* TrayDetailsView::CreateHelpButton(LoginStatus status) {
+views::CustomButton* TrayDetailsView::CreateHelpButton() {
SystemMenuButton* button =
new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED,
kSystemMenuHelpIcon, IDS_ASH_STATUS_TRAY_HELP);
- if (!TrayPopupUtils::CanOpenWebUISettings(status))
+ // Help opens a web page, so treat it like Web UI settings.
+ if (!TrayPopupUtils::CanOpenWebUISettings())
button->SetEnabled(false);
return button;
}
« no previous file with comments | « ash/system/tray/tray_details_view.h ('k') | ash/system/tray/tray_popup_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698