Use ONC carrier info in JS

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
 //   networkingPrivate API. See network_config.js.
 // See crbug.com/279351 for more info.
 
 /**
  * InternetDetailedInfo argument passed to showDetailedInfo.
  * @see chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
  * @typedef {{
- *   carriers: (Array.<string>|undefined),
- *   currentCarrierIndex: (number|undefined),
  *   deviceConnected: (boolean|undefined),
  *   errorMessage: (string|undefined),
  *   servicePath: string,
  *   showCarrierSelect: (boolean|undefined),
  *   showViewAccountButton: (boolean|undefined)
  * }}
  */
 var InternetDetailedInfo;
 
 cr.define('options.internet', function() {
   var OncData = cr.onc.OncData;
   var Page = cr.ui.pageManager.Page;
   var PageManager = cr.ui.pageManager.PageManager;
   /** @const */ var IPAddressField = options.internet.IPAddressField;
 
   /** @const */ var GoogleNameServersString = '8.8.4.4,8.8.8.8';
+  /** @const */ var CarrierGenericUMTS = 'Generic UMTS';
 
   /**
    * Helper function to set hidden attribute for elements matching a selector.
    * @param {string} selector CSS selector for extracting a list of elements.
    * @param {boolean} hidden New hidden value.
    */
   function updateHidden(selector, hidden) {
     var elements = cr.doc.querySelectorAll(selector);
     for (var i = 0, el; el = elements[i]; i++) {
       el.hidden = hidden;
@@ skipping 1303 matching lines @@
       $('wimax-restricted-connectivity').textContent = restrictedString;
 
       $('auto-connect-network-wimax').checked =
           onc.getActiveValue('Wimax.AutoConnect');
       $('auto-connect-network-wimax').disabled = !remembered;
       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'));
-      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');
-          option.textContent = data.carriers[i];
-          carrierSelector.add(option);
+
+      var isGsm = onc.getActiveValue('Cellular.Family') == 'GSM';
+
+      var currentCarrierIndex = -1;
+      if (data.showCarrierSelect) {
+        var currentCarrier =
+            isGsm ? CarrierGenericUMTS : onc.getActiveValue('Cellular.Carrier');
+        var supportedCarriers =
+            onc.getActiveValue('Cellular.SupportedCarriers');
+        for (var c1 = 0; c1 < supportedCarriers.length; ++c1) {
+          if (supportedCarriers[c1] == currentCarrier) {
+            currentCarrierIndex = c1;
+            break;
+          }
         }
-        carrierSelector.selectedIndex = data.currentCarrierIndex;
-      } else {
+        if (currentCarrierIndex != -1) {
+          var carrierSelector = $('select-carrier');
+          carrierSelector.onchange = DetailsInternetPage.handleCarrierChanged;
+          carrierSelector.options.length = 0;
+          for (var c2 = 0; c2 < supportedCarriers.length; ++c2) {
+            var option = document.createElement('option');
+            option.textContent = supportedCarriers[c2];
+            carrierSelector.add(option);
+          }
+          carrierSelector.selectedIndex = currentCarrierIndex;
+        }
+      }
+      if (currentCarrierIndex == -1)
         $('service-name').textContent = networkName;
-      }
 
       $('network-technology').textContent =
           onc.getActiveValue('Cellular.NetworkTechnology');
       $('roaming-state').textContent =
           onc.getTranslatedValue('Cellular.RoamingState');
       $('cellular-restricted-connectivity').textContent = restrictedString;
       if ('errorMessage' in data)
         $('error-state').textContent = data.errorMessage;
       $('manufacturer').textContent =
           onc.getActiveValue('Cellular.Manufacturer');
@@ skipping 22 matching lines @@
       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.
       setOrHideParent('esn', onc.getActiveValue('Cellular.ESN'));
       setOrHideParent('imei', onc.getActiveValue('Cellular.IMEI'));
       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') {
+      if (isGsm) {
         $('iccid').textContent = onc.getActiveValue('Cellular.ICCID');
         $('imsi').textContent = onc.getActiveValue('Cellular.IMSI');
         detailsPage.initializeApnList_();
       }
       $('auto-connect-network-cellular').checked =
           onc.getActiveValue('Cellular.AutoConnect');
       $('auto-connect-network-cellular').disabled = false;
     } else if (type == 'VPN') {
       OptionsPage.showTab($('vpn-nav-tab'));
       $('inet-service-name').textContent = networkName;
@@ skipping 60 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
   };
 });