Fixed enable/disable handling for WiMAX. Removed Cellular section when not available.

chrome/browser/resources/options2/chromeos/network_list.js

 // 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.
 
 cr.define('options.network', function() {
 
   var ArrayDataModel = cr.ui.ArrayDataModel;
   var List = cr.ui.List;
   var ListItem = cr.ui.ListItem;
   var Menu = cr.ui.Menu;
@@ skipping 59 matching lines @@
   var cellularAvailable_ = false;
 
   /**
    * Indicates if cellular networks are enabled.
    * @type {boolean}
    * @private
    */
   var cellularEnabled_ = false;
 
   /**
+   * Indicates if WiMAX networks are available.
+   * @type {boolean}
+   * @private
+   */
+  var wimaxAvailable_ = false;
+
+  /**
+   * Indicates if WiMAX networks are enabled.
+   * @type {boolean}
+   * @private
+   */
+  var wimaxEnabled_ = false;
+
+  /**
    * Indicates if mobile data roaming is enabled.
    * @type {boolean}
    * @private
    */
   var enableDataRoaming_ = false;
 
   /**
    * Create an element in the network list for controlling network
    * connectivity.
    * @param {Object} data Description of the network list or command.
@@ skipping 420 matching lines @@
         if (this.data_.key == 'wifi') {
           addendum.push({label: loadTimeData.getString('turnOffWifi'),
                        command: function() {
                          chrome.send('disableWifi');
                        },
                        data: {}});
         } else if (this.data_.key == 'wimax') {
           // TODO(zelidrag): Add proper strings for wimax.
           addendum.push({label: loadTimeData.getString('turnOffCellular'),
                        command: function() {
-                         chrome.send('disableCellular');
+                         chrome.send('disableWimax');
                        },
                        data: {}});
         } else if (this.data_.key == 'cellular') {
           addendum.push({label: loadTimeData.getString('turnOffCellular'),
                        command: function() {
                          chrome.send('disableCellular');
                        },
                        data: {}});
         }
       }
@@ skipping 292 matching lines @@
 
   /**
    * Chrome callback for updating network controls.
    * @param {Object} data Description of available network devices and their
    *     corresponding state.
    */
   NetworkList.refreshNetworkData = function(data) {
     var networkList = $('network-list');
     cellularAvailable_ = data.cellularAvailable;
     cellularEnabled_ = data.cellularEnabled;
+    wimaxAvailable_ = data.wimaxAvailable;
+    wimaxEnabled_ = data.wimaxEnabled;
 
     if (data.accessLocked) {
       $('network-locked-message').hidden = false;
       networkList.disabled = true;
       $('use-shared-proxies').disabled = true;
     } else {
       $('network-locked-message').hidden = true;
       networkList.disabled = false;
       $('use-shared-proxies').disabled = false;
     }
@@ skipping 24 matching lines @@
       networkList.update({key: 'wifi',
                           subtitle: loadTimeData.getString('networkDisabled'),
                           iconType: 'wifi',
                           command: enableWifi});
     }
 
     // Only show cellular control if available and not in airplane mode.
     if (data.cellularAvailable && !data.airplaneMode) {
       if (data.cellularEnabled) {
         loadData_('cellular', data.wirelessList, data.rememberedList);
-        loadData_('wimax', data.wirelessList, data.rememberedList);
       } else {
         var subtitle = loadTimeData.getString('networkDisabled');
         var enableCellular = function() {
           chrome.send('enableCellular');
         };
         networkList.update({key: 'cellular',
                             subtitle: subtitle,
                             iconType: 'cellular',
                             command: enableCellular});
       }
     } else {
       networkList.deleteItem('cellular');
     }
 
+    // Only show cellular control if available and not in airplane mode.
+    if (data.wimaxAvailable && !data.airplaneMode) {
+      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 {
+      networkList.deleteItem('wimax');
+    }
+
     // Only show VPN control if there is an available network and an internet
     // connection.
     if (data.vpnList.length > 0 && (ethernetConnection ||
         isConnected_(data.wirelessList)))
       loadData_('vpn', data.vpnList, data.rememberedList);
     else
       networkList.deleteItem('vpn');
     networkList.updateToggleControl('airplaneMode', data.airplaneMode);
   };
 
@@ skipping 111 matching lines @@
    * Whether the Network list is disabled. Only used for display purpose.
    * @type {boolean}
    */
   cr.defineProperty(NetworkList, 'disabled', cr.PropertyKind.BOOL_ATTR);
 
   // Export
   return {
     NetworkList: NetworkList
   };
 });