Replace additional network properties with ONC values

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.
 
 // 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
 //   networkingPrivate API. See network_config.js.
 // See crbug.com/279351 for more info.
@@ skipping 1111 matching lines @@
         for (var i = 0; i < data.carriers.length; ++i) {
           var option = document.createElement('option');
           option.textContent = data.carriers[i];
           carrierSelector.add(option);
         }
         carrierSelector.selectedIndex = data.currentCarrierIndex;
       } else {
         $('service-name').textContent = getNetworkName(data);
       }
 
-      $('network-technology').textContent = data.networkTechnology;
+      $('network-technology').textContent = data.Cellular.NetworkTechnology;
       $('activation-state').textContent = data.activationState;
       $('roaming-state').textContent = data.roamingState;
       $('restricted-pool').textContent = data.restrictedPool;
       $('error-state').textContent = data.errorState;
-      $('manufacturer').textContent = data.cellularManufacturer;
-      $('model-id').textContent = data.modelId;
-      $('firmware-revision').textContent = data.firmwareRevision;
-      $('hardware-revision').textContent = data.hardwareRevision;
-      $('mdn').textContent = data.mdn;
-      $('operator-name').textContent = data.operatorName;
-      $('operator-code').textContent = data.operatorCode;
+      $('manufacturer').textContent = data.Cellular.Manufacturer;
+      $('model-id').textContent = data.Cellular.ModelID;
+      $('firmware-revision').textContent = data.Cellular.FirmwareRevision;
+      $('hardware-revision').textContent = data.Cellular.HardwareRevision;
+      $('mdn').textContent = data.Cellular.MDN;
 
+      // Show ServingOperator properties only if available.
+      if (data.Cellular.ServingOperator) {
+        $('operator-name').textContent = data.Cellular.ServingOperator.Name;

[pneubeck (no reviews), 2014/07/07 09:14:26]

could use the setContentOrHide function from below?

[stevenjb, 2014/07/07 23:40:21]

Logic is slightly different; these depend on whether or not the ServingOperator
dictionary exists.

+        $('operator-code').textContent = data.Cellular.ServingOperator.Code;
+      } else {
+        $('operator-name').parentElement.hidden = true;
+        $('operator-code').parentElement.hidden = true;
+      }
       // Make sure that GSM/CDMA specific properties that shouldn't be hidden
       // are visible.
       updateHidden('#details-internet-page .gsm-only', false);
       updateHidden('#details-internet-page .cdma-only', false);
 
       // Show IMEI/ESN/MEID/MIN/PRL only if they are available.
       (function() {
-        var setContentOrHide = function(property) {
-          var value = data[property];
+        var setContentOrHide = function(field, value) {
           if (value)
-            $(property).textContent = value;
+            $(field).textContent = value;
           else
-            $(property).parentElement.hidden = true;
+            $(field).parentElement.hidden = true;
         };
-        setContentOrHide('esn');
-        setContentOrHide('imei');
-        setContentOrHide('meid');
-        setContentOrHide('min');
-        setContentOrHide('prl-version');
+        setContentOrHide('esn', data.Cellular.ESN);
+        setContentOrHide('imei', data.Cellular.IMEI);
+        setContentOrHide('meid', data.Cellular.MEID);
+        setContentOrHide('min', data.Cellular.MIN);
+        setContentOrHide('prl-version', data.Cellular.PRLVersion);
       })();
-      detailsPage.gsm = data.gsm;
-      if (data.gsm) {
-        $('iccid').textContent = stringFromValue(data.iccid);
-        $('imsi').textContent = stringFromValue(data.imsi);
+      detailsPage.gsm = data.Cellular.Family == 'GSM';
+      if (detailsPage.gsm) {
+        $('iccid').textContent = stringFromValue(data.Cellular.ICCID);

[pneubeck (no reviews), 2014/07/07 09:14:26]

stringFromValue not required here and in the next line?

[stevenjb, 2014/07/07 23:40:21]

Done.

+        $('imsi').textContent = stringFromValue(data.Cellular.IMSI);
 
         var apnSelector = $('select-apn');
         // Clear APN lists, keep only last element that "other".
         while (apnSelector.length != 1)
           apnSelector.remove(0);
         var otherOption = apnSelector[0];
         data.selectedApn = -1;
         data.userApnIndex = -1;
         var apnList = data.providerApnList.value;
         for (var i = 0; i < apnList.length; i++) {
@@ skipping 100 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.
     OptionsPage.showPageByName('detailsInternetPage', false);
   };
 
   return {
     DetailsInternetPage: DetailsInternetPage
   };
 });