ash: Disable some entries in the network tray-popup instead of removing them.

ash/system/network/tray_network.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/network/tray_network.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 258 matching lines @@
                   scroller->GetScrollBarWidth(),
                   kNetworkListHeight));
     scroller->SetContentsView(networks);
     AddChildView(scroller);
   }
 
   void AppendNetworkExtra() {
     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());
       }
     }
   }
 
   void AppendNetworkToggles() {
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->tray_delegate();
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     if (delegate->GetWifiAvailable()) {
       HoverHighlightView* container = new HoverHighlightView(this);
@@ skipping 202 matching lines @@
   if (tray_.get())
     tray_->Update(info);
   if (default_.get())
     default_->Update();
   if (detailed_.get())
     detailed_->Update();
 }
 
 }  // namespace internal
 }  // namespace ash