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

Unified Diff: ash/system/network/tray_network.cc

Issue 10079006: ash: Disable some entries in the network tray-popup instead of removing them. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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/tray/tray_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/network/tray_network.cc
diff --git a/ash/system/network/tray_network.cc b/ash/system/network/tray_network.cc
index 9fa70e6c84f40b030abfd36f6393498c21d1f76a..335337f324effbe3efdf93c15160ab7ba7f1ab12 100644
--- a/ash/system/network/tray_network.cc
+++ b/ash/system/network/tray_network.cc
@@ -276,21 +276,21 @@ class NetworkDetailedView : public views::View,
ash::SystemTrayDelegate* delegate =
ash::Shell::GetInstance()->tray_delegate();
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- if (delegate->GetWifiEnabled()) {
- HoverHighlightView* container = new HoverHighlightView(this);
- container->AddLabel(rb.GetLocalizedString(
+ HoverHighlightView* container = new HoverHighlightView(this);
+ container->AddLabel(rb.GetLocalizedString(
IDS_ASH_STATUS_TRAY_OTHER_WIFI), gfx::Font::NORMAL);
- AddChildView(container);
- other_wifi_ = container;
- }
+ AddChildView(container);
+ other_wifi_ = container;
+ other_wifi_->SetEnabled(delegate->GetWifiEnabled());
- if (delegate->GetCellularEnabled()) {
+ if (delegate->GetCellularAvailable()) {
if (delegate->GetCellularScanSupported()) {
HoverHighlightView* container = new HoverHighlightView(this);
container->AddLabel(rb.GetLocalizedString(
IDS_ASH_STATUS_TRAY_OTHER_MOBILE), gfx::Font::NORMAL);
AddChildView(container);
other_mobile_ = container;
+ other_mobile_->SetEnabled(delegate->GetCellularEnabled());
}
}
}
« no previous file with comments | « no previous file | ash/system/tray/tray_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698