Translate Wimax from Shill -> ONC, fix JS Wimax strings.

chrome/browser/resources/options/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 ListSingleSelectionModel = cr.ui.ListSingleSelectionModel;
   var Menu = cr.ui.Menu;
@@ skipping 11 matching lines @@
   Constants.ACTIVATION_STATE_ACTIVATED = 1;
   Constants.ACTIVATION_STATE_ACTIVATING = 2;
   Constants.ACTIVATION_STATE_NOT_ACTIVATED = 3;
   Constants.ACTIVATION_STATE_PARTIALLY_ACTIVATED = 4;
 
   /**
    * Order in which controls are to appear in the network list sorted by key.
    */
   Constants.NETWORK_ORDER = ['Ethernet',
                              'WiFi',
-                             'Wimax',
+                             'WiMAX',
                              'Cellular',
                              'VPN',
                              'addConnection'];
 
   /**
    * ID of the menu that is currently visible.
    * @type {?string}
    * @private
    */
   var activeMenu_ = null;
@@ skipping 489 matching lines @@
               };
               // Add separator
               addendum.push({});
               addendum.push({label: loadTimeData.getString('disconnectNetwork'),
                              command: disconnectCallback,
                              data: data});
             }
           }
         }
       }
-      if (this.data_.key == 'WiFi' || this.data_.key == 'Wimax' ||
+      if (this.data_.key == 'WiFi' || this.data_.key == 'WiMAX' ||
           this.data_.key == 'Cellular') {
         addendum.push({});
         if (this.data_.key == 'WiFi') {
           addendum.push({
             label: loadTimeData.getString('turnOffWifi'),
             command: function() {
               sendChromeMetricsAction('Options_NetworkWifiToggle');
               // TODO(stevenjb): chrome.networkingPrivate.disableNetworkType
               chrome.send('disableNetworkType', ['WiFi']);
             },
             data: {}});
-        } else if (this.data_.key == 'Wimax') {
+        } else if (this.data_.key == 'WiMAX') {
           addendum.push({
             label: loadTimeData.getString('turnOffWimax'),
             command: function() {
               // TODO(stevenjb): chrome.networkingPrivate.disableNetworkType
-              chrome.send('disableNetworkType', ['Wimax']);
+              chrome.send('disableNetworkType', ['WiMAX']);
             },
             data: {}});
         } else if (this.data_.key == 'Cellular') {
           addendum.push({
             label: loadTimeData.getString('turnOffCellular'),
             command: function() {
               // TODO(stevenjb): chrome.networkingPrivate.disableNetworkType
               chrome.send('disableNetworkType', ['Cellular']);
             },
             data: {}});
@@ skipping 449 matching lines @@
         loadData_('Cellular', data.wirelessList, data.rememberedList);
       else
         addEnableNetworkButton_('Cellular');
     } else {
       networkList.deleteItem('Cellular');
     }
 
     // Only show wimax control if available. Uses cellular icons.
     if (data.wimaxAvailable) {
       if (data.wimaxEnabled)
-        loadData_('Wimax', data.wirelessList, data.rememberedList);
+        loadData_('WiMAX', data.wirelessList, data.rememberedList);
       else
-        addEnableNetworkButton_('Wimax');
+        addEnableNetworkButton_('WiMAX');
     } else {
-      networkList.deleteItem('Wimax');
+      networkList.deleteItem('WiMAX');
     }
 
     // Only show VPN control if there is at least one VPN configured.
     if (data.vpnList.length > 0)
       loadData_('VPN', data.vpnList, data.rememberedList);
     else
       networkList.deleteItem('VPN');
     networkList.endBatchUpdates();
   };
 
   /**
    * Replaces a network menu with a button for enabling the network type.
    * @param {string} type The type of network (WiFi, Cellular or Wimax).
    * @private
    */
   function addEnableNetworkButton_(type) {
     var subtitle = loadTimeData.getString('networkDisabled');
-    var icon = (type == 'Wimax') ? 'Cellular' : type;
+    var icon = (type == 'WiMAX') ? 'Cellular' : type;
     var enableNetwork = function() {
       if (type == 'WiFi')
         sendChromeMetricsAction('Options_NetworkWifiToggle');
       if (type == 'Cellular') {
         if (cellularSimLockType_) {
           chrome.send('simOperation', ['unlock']);
           return;
         } else if (cellularEnabled_ && cellularSimAbsent_) {
           chrome.send('simOperation', ['configure']);
           return;
@@ skipping 141 matching lines @@
   /**
    * Whether the Network list is disabled. Only used for display purpose.
    */
   cr.defineProperty(NetworkList, 'disabled', cr.PropertyKind.BOOL_ATTR);
 
   // Export
   return {
     NetworkList: NetworkList
   };
 });