Use networkingPrivate types 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 chrome.networkingPrivate calls.
 // See crbug.com/279351 for more info.
 
 cr.define('options.internet', function() {
   var OncData = cr.onc.OncData;
   var Page = cr.ui.pageManager.Page;
   var PageManager = cr.ui.pageManager.PageManager;
+
+  var ActivationStateType = chrome.networkingPrivate.ActivationStateType;
+  var ConnectionStateType = chrome.networkingPrivate.ConnectionStateType;
+  var NetworkType = chrome.networkingPrivate.NetworkType;
+
   /** @const */ var IPAddressField = options.internet.IPAddressField;
 
   /** @const */ var GoogleNameServers = ['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.
    */
@@ skipping 49 matching lines @@
   function sendChromeMetricsAction(action) {
     chrome.send('coreOptionsUserMetricsAction', [action]);
   }
 
   /**
    * Send metrics to Chrome when the detailed page is opened.
    * @param {string} type The ONC type of the network being shown.
    * @param {string} state The ONC network state.
    */
   function sendShowDetailsMetrics(type, state) {
-    if (type == 'WiFi') {
+    if (type == NetworkType.WiFi) {
       sendChromeMetricsAction('Options_NetworkShowDetailsWifi');
-      if (state != 'NotConnected')
+      if (state != ConnectionStateType.NotConnected)
         sendChromeMetricsAction('Options_NetworkShowDetailsWifiConnected');
-    } else if (type == 'Cellular') {
+    } else if (type == NetworkType.Cellular) {
       sendChromeMetricsAction('Options_NetworkShowDetailsCellular');
-      if (state != 'NotConnected')
+      if (state != ConnectionStateType.NotConnected)
         sendChromeMetricsAction('Options_NetworkShowDetailsCellularConnected');
-    } else if (type == 'VPN') {
+    } else if (type == NetworkType.VPN) {
       sendChromeMetricsAction('Options_NetworkShowDetailsVPN');
-      if (state != 'NotConnected')
+      if (state != ConnectionStateType.NotConnected)
         sendChromeMetricsAction('Options_NetworkShowDetailsVPNConnected');
     }
   }
 
   /**
    * Returns the netmask as a string for a given prefix length.
    * @param {number} prefixLength The ONC routing prefix length.
    * @return {string} The corresponding netmask.
    */
   function prefixLengthToNetmask(prefixLength) {
@@ skipping 400 matching lines @@
       var onc = this.onc_;
 
       // Always show the ipconfig section. TODO(stevenjb): Improve the display
       // for unconnected networks. Currently the IP address fields may be
       // 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');
+                   this.type_ != NetworkType.Cellular);
       updateHidden('#details-internet-page .wifi-details',
-                   this.type_ != 'WiFi');
+                   this.type_ != NetworkType.WiFi);
       updateHidden('#details-internet-page .wimax-details',
-                   this.type_ != 'WiMAX');
-      updateHidden('#details-internet-page .vpn-details', this.type_ != 'VPN');
+                   this.type_ != NetworkType.WiMAX);
+      updateHidden('#details-internet-page .vpn-details',
+                   this.type_ != NetworkType.VPN);
       updateHidden('#details-internet-page .proxy-details', !this.showProxy_);
 
       // Cellular
-      if (onc && this.type_ == 'Cellular') {
+      if (onc && this.type_ == NetworkType.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);
       }
 
       // Wifi
 
       // Hide network tab for VPN.
       updateHidden('#details-internet-page .network-details',
-                   this.type_ == 'VPN');
+                   this.type_ == NetworkType.VPN);
 
       // Password and shared.
-      var source = onc ? onc.getSource() : 'None';
+      var source = (onc && onc.getSource()) || 'None';

[pneubeck (no reviews), 2015/03/26 16:56:47]

please comment on the intention here.
I guess that you want to change an undefined source to 'None'.
If possible keep this separate if it's unrelated from the remainder of this CL.

       var shared = (source == 'Device' || source == 'DevicePolicy');
-      var security = onc ? onc.getWiFiSecurity() : 'None';
+      var security = (onc && onc.getWiFiSecurity()) || 'None';
       updateHidden('#details-internet-page #password-details',
-                   this.type_ != 'WiFi' || security == 'None');
+                   (this.type_ != NetworkType.WiFi || security == 'None'));
       updateHidden('#details-internet-page #wifi-shared-network', !shared);
       updateHidden('#details-internet-page #prefer-network', source == 'None');
 
       // WiMAX.
       updateHidden('#details-internet-page #wimax-shared-network', !shared);
 
       // Proxy
       this.updateProxyBannerVisibility_();
       this.toggleSingleProxy_();
       if ($('manual-proxy').checked)
@@ skipping 114 matching lines @@
       sendChromeMetricsAction('Options_NetworkManualProxy_Enable');
     },
 
     /**
      * Helper method called from initializeDetailsPage and updateConnectionData.
      * Updates visibility/enabled of the login/disconnect/configure buttons.
      * @private
      */
     updateConnectionButtonVisibilty_: function() {
       var onc = this.onc_;
-      if (this.type_ == 'Ethernet') {
+      if (this.type_ == NetworkType.Ethernet) {
         // Ethernet can never be connected or disconnected and can always be
         // configured (e.g. to set security).
         $('details-internet-login').hidden = true;
         $('details-internet-disconnect').hidden = true;
         $('details-internet-configure').hidden = false;
         return;
       }
 
       var connectState = onc.getActiveValue('ConnectionState');
-      if (connectState == 'NotConnected') {
+      if (connectState == ConnectionStateType.NotConnected) {
         $('details-internet-login').hidden = false;
         // Connecting to an unconfigured network might trigger certificate
         // installation UI. Until that gets handled here, always enable the
         // Connect button.
         $('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'))) {
+      if (connectState != ConnectionStateType.Connected &&
+          (!connectable || (onc.getWiFiSecurity() != 'None') ||
+           (this.type_ == NetworkType.WiMAX ||
+            this.type_ == NetworkType.VPN))) {
         $('details-internet-configure').hidden = false;
       } else {
         $('details-internet-configure').hidden = true;
       }
     },
 
     /**
      * Helper method called from initializeDetailsPage 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') {
+      if (type == NetworkType.WiFi) {
         $('wifi-connection-state').textContent = connectionStateString;
-      } else if (type == 'WiMAX') {
+      } else if (type == NetworkType.WiMAX) {
         $('wimax-connection-state').textContent = connectionStateString;
-      } else if (type == 'Cellular') {
+      } else if (type == NetworkType.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;
         }
         showViewAccount = onc.getActiveValue('showViewAccountButton');
         var activationState = onc.getActiveValue('Cellular.ActivationState');
-        showActivate = activationState == 'NotActivated' ||
-            activationState == 'PartiallyActivated';
+        showActivate =
+            activationState == ActivationStateType.NotActivated ||
+            activationState == ActivationStateType.PartiallyActivated;
       }
 
       $('view-account-details').hidden = !showViewAccount;
       $('activate-details').hidden = !showActivate;
       // If activation is not complete, hide the login button.
       if (showActivate)
         $('details-internet-login').hidden = true;
     },
 
     /**
      * Helper method called from initializeDetailsPage and updateConnectionData.
      * Updates the fields in the header section of the details frame.
      * @private
      */
     populateHeader_: function() {
       var onc = this.onc_;
 
       $('network-details-title').textContent =
           this.networkTitle_ || onc.getTranslatedValue('Name');
 
       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')
+      if (type == NetworkType.Ethernet)
         typeKey = 'ethernetTitle';
-      else if (type == 'WiFi')
+      else if (type == NetworkType.WiFi)
         typeKey = 'wifiTitle';
-      else if (type == 'WiMAX')
+      else if (type == NetworkType.WiMAX)
         typeKey = 'wimaxTitle';
-      else if (type == 'Cellular')
+      else if (type == NetworkType.Cellular)
         typeKey = 'cellularTitle';
-      else if (type == 'VPN')
+      else if (type == NetworkType.VPN)
         typeKey = 'vpnTitle';
       else
         typeKey = null;
       var typeLabel = $('network-details-subtitle-type');
       var typeSeparator = $('network-details-subtitle-separator');
       if (typeKey) {
         typeLabel.textContent = loadTimeData.getString(typeKey);
         typeLabel.hidden = false;
         typeSeparator.hidden = false;
       } else {
@@ skipping 336 matching lines @@
         }
       }
   };
 
   DetailsInternetPage.updateCarrier = function() {
     DetailsInternetPage.showCarrierChangeSpinner(false);
   };
 
   DetailsInternetPage.loginFromDetails = function() {
     var detailsPage = DetailsInternetPage.getInstance();
-    if (detailsPage.type_ == 'WiFi')
+    if (detailsPage.type_ == NetworkType.WiFi)
       sendChromeMetricsAction('Options_NetworkConnectToWifi');
-    else if (detailsPage.type_ == 'VPN')
+    else if (detailsPage.type_ == NetworkType.VPN)
       sendChromeMetricsAction('Options_NetworkConnectToVPN');
     // TODO(stevenjb): chrome.networkingPrivate.startConnect
     chrome.send('startConnect', [detailsPage.onc_.guid()]);
     PageManager.closeOverlay();
   };
 
   DetailsInternetPage.disconnectNetwork = function() {
     var detailsPage = DetailsInternetPage.getInstance();
-    if (detailsPage.type_ == 'WiFi')
+    if (detailsPage.type_ == NetworkType.WiFi)
       sendChromeMetricsAction('Options_NetworkDisconnectWifi');
-    else if (detailsPage.type_ == 'VPN')
+    else if (detailsPage.type_ == NetworkType.VPN)
       sendChromeMetricsAction('Options_NetworkDisconnectVPN');
     chrome.networkingPrivate.startDisconnect(detailsPage.onc_.guid());
     PageManager.closeOverlay();
   };
 
   DetailsInternetPage.configureNetwork = function() {
     var detailsPage = DetailsInternetPage.getInstance();
     chrome.send('configureNetwork', [detailsPage.onc_.guid()]);
     PageManager.closeOverlay();
   };
 
   DetailsInternetPage.activateFromDetails = function() {
     var detailsPage = DetailsInternetPage.getInstance();
-    if (detailsPage.type_ == 'Cellular') {
+    if (detailsPage.type_ == NetworkType.Cellular) {
       chrome.send('activateNetwork', [detailsPage.onc_.guid()]);
     }
     PageManager.closeOverlay();
   };
 
   /**
    * Event handler called when the details page is closed. Sends changed
    * properties to Chrome and closes the overlay.
    */
   DetailsInternetPage.setDetails = function() {
     var detailsPage = DetailsInternetPage.getInstance();
     var type = detailsPage.type_;
     var oncData = new OncData({});
     var autoConnectCheckboxId = '';
-    if (type == 'WiFi') {
+    if (type == NetworkType.WiFi) {
       var preferredCheckbox =
           assertInstanceof($('prefer-network-wifi'), HTMLInputElement);
       if (!preferredCheckbox.hidden && !preferredCheckbox.disabled) {
         var kPreferredPriority = 1;
         var priority = preferredCheckbox.checked ? kPreferredPriority : 0;
         oncData.setProperty('Priority', priority);
         sendChromeMetricsAction('Options_NetworkSetPrefer');
       }
       autoConnectCheckboxId = 'auto-connect-network-wifi';
-    } else if (type == 'WiMAX') {
+    } else if (type == NetworkType.WiMAX) {
       autoConnectCheckboxId = 'auto-connect-network-wimax';
-    } else if (type == 'Cellular') {
+    } else if (type == NetworkType.Cellular) {
       autoConnectCheckboxId = 'auto-connect-network-cellular';
-    } else if (type == 'VPN') {
+    } else if (type == NetworkType.VPN) {
       var providerType = detailsPage.onc_.getActiveValue('VPN.Type');
       if (providerType != 'ThirdPartyVPN') {
         oncData.setProperty('VPN.Type', providerType);
         oncData.setProperty('VPN.Host', $('inet-server-hostname').value);
         autoConnectCheckboxId = 'auto-connect-network-vpn';
       }
     }
     if (autoConnectCheckboxId != '') {
       var autoConnectCheckbox =
           assertInstanceof($(autoConnectCheckboxId), HTMLInputElement);
@@ skipping 104 matching lines @@
   DetailsInternetPage.initializeDetailsPage = function(oncData) {
     var onc = new OncData(oncData);
 
     var detailsPage = DetailsInternetPage.getInstance();
     detailsPage.onc_ = onc;
     var type = onc.getActiveValue('Type');
     detailsPage.type_ = type;
 
     sendShowDetailsMetrics(type, onc.getActiveValue('ConnectionState'));
 
-    if (type == 'VPN') {
+    if (type == NetworkType.VPN) {
       // Cache the dialog title, which will contain the provider name in the
       // case of a third-party VPN provider. This caching is important as the
       // provider may go away while the details dialog is being shown, causing
       // subsequent updates to be unable to determine the correct title.
       detailsPage.networkTitle_ = options.VPNProviders.formatNetworkName(onc);
     } else {
       delete detailsPage.networkTitle_;
     }
 
     detailsPage.populateHeader_();
@@ skipping 194 matching lines @@
         $(field).parentElement.hidden = false;
       } else {
         $(field).parentElement.hidden = true;
       }
     };
 
     var networkName = onc.getTranslatedValue('Name');
 
     // Signal strength as percentage (for WiFi and WiMAX).
     var signalStrength;
-    if (type == 'WiFi' || type == 'WiMAX')
+    if (type == NetworkType.WiFi || type == NetworkType.WiMAX)
       signalStrength = onc.getActiveValue(type + '.SignalStrength');
     if (!signalStrength)
       signalStrength = 0;
     var strengthFormat = loadTimeData.getString('inetSignalStrengthFormat');
     var strengthString = strengthFormat.replace('$1', signalStrength);
 
-    if (type == 'WiFi') {
+    if (type == NetworkType.WiFi) {
       OptionsPage.showTab($('wifi-network-nav-tab'));
       $('wifi-restricted-connectivity').textContent = restrictedString;
       var ssid = onc.getActiveValue('WiFi.SSID');
       $('wifi-ssid').textContent = ssid ? ssid : networkName;
       setOrHideParent('wifi-bssid', onc.getActiveValue('WiFi.BSSID'));
       var security = onc.getWiFiSecurity();
       if (security == 'None')
         security = undefined;
       setOrHideParent('wifi-security', security);
       // Frequency is in MHz.
       var frequency = onc.getActiveValue('WiFi.Frequency');
       if (!frequency)
         frequency = 0;
       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('WiFi.AutoConnect');
       $('auto-connect-network-wifi').disabled = !remembered;
-    } else if (type == 'WiMAX') {
+    } else if (type == NetworkType.WiMAX) {
       OptionsPage.showTab($('wimax-network-nav-tab'));
       $('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') {
+    } else if (type == NetworkType.Cellular) {
       OptionsPage.showTab($('cellular-conn-nav-tab'));
 
       var isGsm = onc.getActiveValue('Cellular.Family') == 'GSM';
 
       var currentCarrierIndex = -1;
       if (loadTimeData.getValue('showCarrierSelect')) {
         var currentCarrier =
             isGsm ? CarrierGenericUMTS : onc.getActiveValue('Cellular.Carrier');
         var supportedCarriers =
             onc.getActiveValue('Cellular.SupportedCarriers');
@@ skipping 60 matching lines @@
       setOrHideParent('prl-version', onc.getActiveValue('Cellular.PRLVersion'));
 
       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') {
+    } else if (type == NetworkType.VPN) {
       OptionsPage.showTab($('vpn-nav-tab'));
       var providerType = onc.getActiveValue('VPN.Type');
       var isThirdPartyVPN = providerType == 'ThirdPartyVPN';
       $('vpn-tab').classList.toggle('third-party-vpn-provider',
                                     isThirdPartyVPN);
 
       $('inet-service-name').textContent = networkName;
       $('inet-provider-type').textContent =
           onc.getTranslatedValue('VPN.Type');
 
@@ skipping 73 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
   };
 });