Merge 163304

> Restore proper handling of a disabled 3g network on the settings page.
> 
> BUG=154963
> 
> 
> Review URL: https://chromiumcodereview.appspot.com/11223002

TBR=kevers@chromium.org
Review URL: https://codereview.chromium.org/11773030

git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@175375 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 29 insertions, 22 deletions

diff --git a/chrome/browser/resources/options/chromeos/network_list.js b/chrome/browser/resources/options/chromeos/network_list.js
index 863f4da..5aff523 100644
--- a/chrome/browser/resources/options/chromeos/network_list.js
+++ b/chrome/browser/resources/options/chromeos/network_list.js
@@ -938,39 +938,27 @@ cr.define('options.network', function() {
       networkList.deleteItem('ethernet');
     }
 
-    if (data.wifiEnabled) {
+    if (data.wifiEnabled)
       loadData_('wifi', data.wirelessList, data.rememberedList);
-    } else {
-      var enableWifi = function() {
-        chrome.send('enableWifi');
-      };
-      networkList.update({key: 'wifi',
-                          subtitle: loadTimeData.getString('networkDisabled'),
-                          iconType: 'wifi',
-                          command: enableWifi});
-    }
+    else
+      addEnableNetworkButton_('wifi', 'enableWifi', 'wifi');
 
     // Only show cellular control if available and not in airplane mode.
     if (data.cellularAvailable && !data.airplaneMode) {
-      loadData_('cellular', data.wirelessList, data.rememberedList);
+      if (data.cellularEnabled)
+        loadData_('cellular', data.wirelessList, data.rememberedList);
+      else
+        addEnableNetworkButton_('cellular', 'enableCellular', 'cellular');
     } else {
       networkList.deleteItem('cellular');
     }
 
     // Only show cellular control if available and not in airplane mode.
     if (data.wimaxAvailable && !data.airplaneMode) {
-      if (data.wimaxEnabled) {
+      if (data.wimaxEnabled)
         loadData_('wimax', data.wirelessList, data.rememberedList);
-      } else {
-        var subtitle = loadTimeData.getString('networkDisabled');
-        var enableWimax = function() {
-          chrome.send('enableWimax');
-        };
-        networkList.update({key: 'wimax',
-                            subtitle: subtitle,
-                            iconType: 'cellular',
-                            command: enableWimax});
-      }
+      else
+        addEnableNetworkButton_('wimax', 'enableWimax', 'cellular');
     } else {
       networkList.deleteItem('wimax');
     }
@@ -987,6 +975,25 @@ cr.define('options.network', function() {
   };
 
   /**
+   * Replaces a network menu with a button for reenabling the type of network.
+   * @param {string} name The type of network (wifi, cellular or wimax).
+   * @param {string} command The command for reenabling the network.
+   * @param {string} type of icon (wifi or cellular).
+   * @private
+   */
+  function addEnableNetworkButton_(name, command, icon) {
+    var subtitle = loadTimeData.getString('networkDisabled');
+    var enableNetwork = function() {
+      chrome.send(command);
+    };
+    var networkList = $('network-list');
+    networkList.update({key: name,
+                        subtitle: subtitle,
+                        iconType: icon,
+                        command: enableNetwork});
+  }
+
+  /**
    * Element for indicating a policy managed network.
    * @constructor
    */