Fix some properties on the settings page read from ONC.

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 1289 matching lines @@
       var frequencyFormat = loadTimeData.getString('inetFrequencyFormat');
       frequencyFormat = frequencyFormat.replace('$1', frequency);
       $('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('AutoConnect');
+          onc.getActiveValue('WiFi.AutoConnect');
       $('auto-connect-network-wifi').disabled = !remembered;
     } else if (type == 'Wimax') {
       OptionsPage.showTab($('wimax-network-nav-tab'));
       $('wimax-restricted-connectivity').textContent = restrictedString;
-      $('auto-connect-network-wimax').checked =
-          onc.getActiveValue('AutoConnect');
-      $('auto-connect-network-wimax').disabled = !remembered;
-      var identity = onc.getActiveValue('Wimax.EAP.Identity');
+
+      // ONC does not support Wimax properties, yet.
+      $('auto-connect-network-wimax').parentElement.hidden = true;
+      // $('auto-connect-network-wimax').checked =
+      //     onc.getActiveValue('Wimax.AutoConnect');
+      // $('auto-connect-network-wimax').disabled = !remembered;
+      var identity; // = onc.getActiveValue('Wimax.EAP.Identity');

[stevenjb, 2014/09/15 16:38:41]

Do we actually need to remove this? The code should be equally broken either
way. If we do need to comment this out, please add a TODO.

[pneubeck (no reviews), 2014/09/15 20:27:13]

As discussed this should already handle it gracefully, if the properties are not
existent.
Keeping the original code.

       setOrHideParent('wimax-eap-identity', identity);
       $('wimax-signal-strength').textContent = strengthString;
     } else if (type == 'Cellular') {
       OptionsPage.showTab($('cellular-conn-nav-tab'));
       if (data.showCarrierSelect && data.currentCarrierIndex != -1) {
         var carrierSelector = $('select-carrier');
         carrierSelector.onchange = DetailsInternetPage.handleCarrierChanged;
         carrierSelector.options.length = 0;
         for (var i = 0; i < data.carriers.length; ++i) {
           var option = document.createElement('option');
@@ skipping 44 matching lines @@
       setOrHideParent('meid', onc.getActiveValue('Cellular.MEID'));
       setOrHideParent('min', onc.getActiveValue('Cellular.MIN'));
       setOrHideParent('prl-version', onc.getActiveValue('Cellular.PRLVersion'));
 
       if (onc.getActiveValue('Cellular.Family') == 'GSM') {
         $('iccid').textContent = onc.getActiveValue('Cellular.ICCID');
         $('imsi').textContent = onc.getActiveValue('Cellular.IMSI');
         detailsPage.initializeApnList_(onc);
       }
       $('auto-connect-network-cellular').checked =
-          onc.getActiveValue('AutoConnect');
+          onc.getActiveValue('Cellular.AutoConnect');
       $('auto-connect-network-cellular').disabled = false;
     } else if (type == 'VPN') {
       OptionsPage.showTab($('vpn-nav-tab'));
       $('inet-service-name').textContent = networkName;
       $('inet-provider-type').textContent =
           onc.getTranslatedValue('VPN.Type');
       var providerType = onc.getActiveValue('VPN.Type');
-      var providerKey = 'VPN.' + providerType;
-      $('inet-username').textContent =
-          onc.getActiveValue(providerKey + '.Username');
+      var usernameKey;
+      if (providerType == 'OpenVPN')
+        usernameKey = 'VPN.OpenVPN.Username';
+      else if (providerType == 'L2TP-IPsec')
+        usernameKey = 'VPN.L2TP.Username';
+
+      if (usernameKey) {
+        $('inet-username').parentElement.hidden = false;
+        $('inet-username').textContent = onc.getActiveValue(usernameKey);
+      } else {
+        $('inet-username').parentElement.hidden = true;
+      }
       var inetServerHostname = $('inet-server-hostname');
       inetServerHostname.value = onc.getActiveValue('VPN.Host');
       inetServerHostname.resetHandler = function() {
         PageManager.hideBubble();
         var recommended = onc.getRecommendedValue('VPN.Host');
         if (recommended != undefined)
           inetServerHostname.value = recommended;
       };
       $('auto-connect-network-vpn').checked =
-          onc.getActiveValue('AutoConnect');
+          onc.getActiveValue('VPN.AutoConnect');
       $('auto-connect-network-vpn').disabled = false;
     } else {
       OptionsPage.showTab($('internet-nav-tab'));
     }
 
     // Update controlled option indicators.
     var indicators = cr.doc.querySelectorAll(
         '#details-internet-page .controlled-setting-indicator');
     for (var i = 0; i < indicators.length; i++) {
       var managed = indicators[i].hasAttribute('managed');
@@ skipping 25 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
   };
 });