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

Unified Diff: ash/system/bluetooth/tray_bluetooth.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 | « no previous file | ash/system/date/system_info_default_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/bluetooth/tray_bluetooth.cc
diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc
index 895dc594328cd60a6e487b3c5206584ab88310a1..d5c5b3fb530b675b9004aef37cbe3c0424f99560 100644
--- a/ash/system/bluetooth/tray_bluetooth.cc
+++ b/ash/system/bluetooth/tray_bluetooth.cc
@@ -482,13 +482,12 @@ class BluetoothDetailedView : public TrayDetailsView {
TrayPopupUtils::CreateToggleButton(this, IDS_ASH_STATUS_TRAY_BLUETOOTH);
tri_view()->AddView(TriView::Container::END, toggle_);
- settings_ =
- CreateSettingsButton(login_, IDS_ASH_STATUS_TRAY_BLUETOOTH_SETTINGS);
+ settings_ = CreateSettingsButton(IDS_ASH_STATUS_TRAY_BLUETOOTH_SETTINGS);
tri_view()->AddView(TriView::Container::END, settings_);
}
void ShowSettings() {
- if (TrayPopupUtils::CanOpenWebUISettings(login_)) {
+ if (TrayPopupUtils::CanOpenWebUISettings()) {
Shell::Get()->system_tray_controller()->ShowBluetoothSettings();
owner()->system_tray()->CloseSystemBubble();
}
@@ -573,6 +572,7 @@ class BluetoothDetailedView : public TrayDetailsView {
}
}
+ // TODO(jamescook): Don't cache this.
LoginStatus login_;
std::map<views::View*, std::string> device_map_;
« no previous file with comments | « no previous file | ash/system/date/system_info_default_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698