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

chrome/browser/resources/options/chromeos/internet_detail.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.
 
 // require: onc_data.js
 
 // NOTE(stevenjb): This code is in the process of being converted to be
 // compatible with the networkingPrivate extension API:
 // * The network property dictionaries are being converted to use ONC values.
 // * chrome.send calls will be replaced with an API object that simulates the
@@ skipping 441 matching lines @@
       // blank if the network is not connected.
       $('ipconfig-section').hidden = false;
       $('ipconfig-dns-section').hidden = false;
 
       // Network type related.
       updateHidden('#details-internet-page .cellular-details',
                    this.type_ != 'Cellular');
       updateHidden('#details-internet-page .wifi-details',
                    this.type_ != 'WiFi');
       updateHidden('#details-internet-page .wimax-details',
-                   this.type_ != 'Wimax');
+                   this.type_ != 'WiMAX');
       updateHidden('#details-internet-page .vpn-details', this.type_ != 'VPN');
       updateHidden('#details-internet-page .proxy-details', !this.showProxy_);
 
       // Cellular
       if (this.type_ == 'Cellular') {
         // Hide gsm/cdma specific elements.
         if (onc.getActiveValue('Cellular.Family') == 'GSM')
           updateHidden('#details-internet-page .cdma-only', true);
         else
           updateHidden('#details-internet-page .gsm-only', true);
@@ skipping 162 matching lines @@
         $('details-internet-login').disabled = false;
         $('details-internet-disconnect').hidden = true;
       } else {
         $('details-internet-login').hidden = true;
         $('details-internet-disconnect').hidden = false;
       }
 
       var connectable = onc.getActiveValue('Connectable');
       if (connectState != 'Connected' &&
           (!connectable || onc.getWiFiSecurity() != 'None' ||
-          (this.type_ == 'Wimax' || this.type_ == 'VPN'))) {
+          (this.type_ == 'WiMAX' || this.type_ == 'VPN'))) {
         $('details-internet-configure').hidden = false;
       } else {
         $('details-internet-configure').hidden = true;
       }
     },
 
     /**
      * Helper method called from showDetailedInfo and updateConnectionData.
      * Updates the connection state property and account / sim card links.
      * @private
      */
     updateDetails_: function() {
       var onc = this.onc_;
 
       var connectionStateString = onc.getTranslatedValue('ConnectionState');
       $('connection-state').textContent = connectionStateString;
 
       var type = this.type_;
       var showViewAccount = false;
       var showActivate = false;
       if (type == 'WiFi') {
         $('wifi-connection-state').textContent = connectionStateString;
-      } else if (type == 'Wimax') {
+      } else if (type == 'WiMAX') {
         $('wimax-connection-state').textContent = connectionStateString;
       } else if (type == 'Cellular') {
         $('activation-state').textContent =
             onc.getTranslatedValue('Cellular.ActivationState');
         if (onc.getActiveValue('Cellular.Family') == 'GSM') {
           var lockEnabled =
               onc.getActiveValue('Cellular.SIMLockStatus.LockEnabled');
           $('sim-card-lock-enabled').checked = lockEnabled;
           $('change-pin').hidden = !lockEnabled;
         }
@@ skipping 22 matching lines @@
       var connectionState = onc.getActiveValue('ConnectionState');
       var connectionStateString = onc.getTranslatedValue('ConnectionState');
       $('network-details-subtitle-status').textContent = connectionStateString;
 
       var typeKey;
       var type = this.type_;
       if (type == 'Ethernet')
         typeKey = 'ethernetTitle';
       else if (type == 'WiFi')
         typeKey = 'wifiTitle';
-      else if (type == 'Wimax')
+      else if (type == 'WiMAX')
         typeKey = 'wimaxTitle';
       else if (type == 'Cellular')
         typeKey = 'cellularTitle';
       else if (type == 'VPN')
         typeKey = 'vpnTitle';
       else
         typeKey = null;
       var typeLabel = $('network-details-subtitle-type');
       var typeSeparator = $('network-details-subtitle-separator');
       if (typeKey) {
@@ skipping 345 matching lines @@
     var servicePath = detailsPage.servicePath_;
     if (type == 'WiFi') {
       sendCheckedIfEnabled(servicePath,
                            'setPreferNetwork',
                            'prefer-network-wifi',
                            'Options_NetworkSetPrefer');
       sendCheckedIfEnabled(servicePath,
                            'setAutoConnect',
                            'auto-connect-network-wifi',
                            'Options_NetworkAutoConnect');
-    } else if (type == 'Wimax') {
+    } else if (type == 'WiMAX') {
       sendCheckedIfEnabled(servicePath,
                            'setAutoConnect',
                            'auto-connect-network-wimax',
                            'Options_NetworkAutoConnect');
     } else if (type == 'Cellular') {
       sendCheckedIfEnabled(servicePath,
                            'setAutoConnect',
                            'auto-connect-network-cellular',
                            'Options_NetworkAutoConnect');
     } else if (type == 'VPN') {
@@ skipping 301 matching lines @@
       if (property != undefined) {
         $(field).textContent = property;
         $(field).parentElement.hidden = false;
       } else {
         $(field).parentElement.hidden = true;
       }
     };
 
     var networkName = onc.getTranslatedValue('Name');
 
-    // Signal strength as percentage (for WiFi and Wimax).
+    // Signal strength as percentage (for WiFi and WiMAX).
     var signalStrength;
-    if (type == 'WiFi' || type == 'Wimax')
+    if (type == 'WiFi' || type == 'WiMAX')
       signalStrength = onc.getActiveValue(type + '.SignalStrength');
     if (!signalStrength)
       signalStrength = 0;
     var strengthFormat = loadTimeData.getString('inetSignalStrengthFormat');
     var strengthString = strengthFormat.replace('$1', signalStrength);
 
     if (type == 'WiFi') {
       OptionsPage.showTab($('wifi-network-nav-tab'));
       $('wifi-restricted-connectivity').textContent = restrictedString;
       var ssid = onc.getActiveValue('WiFi.SSID');
@@ skipping 12 matching lines @@
       $('wifi-frequency').textContent = frequencyFormat;
       $('wifi-signal-strength').textContent = strengthString;
       setOrHideParent('wifi-hardware-address',
                       onc.getActiveValue('MacAddress'));
       var priority = onc.getActiveValue('Priority');
       $('prefer-network-wifi').checked = priority > 0;
       $('prefer-network-wifi').disabled = !remembered;
       $('auto-connect-network-wifi').checked =
           onc.getActiveValue('WiFi.AutoConnect');
       $('auto-connect-network-wifi').disabled = !remembered;
-    } else if (type == 'Wimax') {
+    } else if (type == 'WiMAX') {
       OptionsPage.showTab($('wimax-network-nav-tab'));
       $('wimax-restricted-connectivity').textContent = restrictedString;
 
       $('auto-connect-network-wimax').checked =
-          onc.getActiveValue('Wimax.AutoConnect');
+          onc.getActiveValue('WiMAX.AutoConnect');
       $('auto-connect-network-wimax').disabled = !remembered;
-      var identity = onc.getActiveValue('Wimax.EAP.Identity');
+      var identity = onc.getActiveValue('WiMAX.EAP.Identity');
       setOrHideParent('wimax-eap-identity', identity);
       $('wimax-signal-strength').textContent = strengthString;
     } else if (type == 'Cellular') {
       OptionsPage.showTab($('cellular-conn-nav-tab'));
 
       var isGsm = onc.getActiveValue('Cellular.Family') == 'GSM';
 
       var currentCarrierIndex = -1;
       if (this.showCarrierSelect_) {
         var currentCarrier =
@@ skipping 136 matching lines @@
 
     // Don't show page name in address bar and in history to prevent people
     // navigate here by hand and solve issue with page session restore.
     PageManager.showPageByName('detailsInternetPage', false);
   };
 
   return {
     DetailsInternetPage: DetailsInternetPage
   };
 });