Use networkingPrivate types in JS

chrome/browser/resources/options/chromeos/internet_detail.js

Index: chrome/browser/resources/options/chromeos/internet_detail.js
diff --git a/chrome/browser/resources/options/chromeos/internet_detail.js b/chrome/browser/resources/options/chromeos/internet_detail.js
index e811a4b833b136b2cb4faf485567e37f074d8153..fbd1092fc282abf4a60551cce27f42f497fcde24 100644
--- a/chrome/browser/resources/options/chromeos/internet_detail.js
+++ b/chrome/browser/resources/options/chromeos/internet_detail.js
@@ -14,6 +14,11 @@ 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'];
@@ -83,17 +88,17 @@ cr.define('options.internet', function() {
    * @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');
     }
   }
@@ -514,16 +519,17 @@ cr.define('options.internet', function() {
 
       // 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);
@@ -535,14 +541,14 @@ cr.define('options.internet', function() {
 
       // 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');
 
@@ -677,7 +683,7 @@ cr.define('options.internet', function() {
      */
     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;
@@ -687,7 +693,7 @@ cr.define('options.internet', function() {
       }
 
       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
@@ -700,9 +706,10 @@ cr.define('options.internet', function() {
       }
 
       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;
@@ -723,11 +730,11 @@ cr.define('options.internet', function() {
       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') {
@@ -738,8 +745,9 @@ cr.define('options.internet', function() {
         }
         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;
@@ -766,15 +774,15 @@ cr.define('options.internet', function() {
 
       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;
@@ -1131,9 +1139,9 @@ cr.define('options.internet', function() {
 
   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()]);
@@ -1142,9 +1150,9 @@ cr.define('options.internet', function() {
 
   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();
@@ -1158,7 +1166,7 @@ cr.define('options.internet', function() {
 
   DetailsInternetPage.activateFromDetails = function() {
     var detailsPage = DetailsInternetPage.getInstance();
-    if (detailsPage.type_ == 'Cellular') {
+    if (detailsPage.type_ == NetworkType.Cellular) {
       chrome.send('activateNetwork', [detailsPage.onc_.guid()]);
     }
     PageManager.closeOverlay();
@@ -1173,7 +1181,7 @@ cr.define('options.internet', function() {
     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) {
@@ -1183,11 +1191,11 @@ cr.define('options.internet', function() {
         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);
@@ -1312,7 +1320,7 @@ cr.define('options.internet', function() {
 
     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
@@ -1527,14 +1535,14 @@ cr.define('options.internet', function() {
 
     // 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');
@@ -1560,7 +1568,7 @@ cr.define('options.internet', function() {
       $('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;
 
@@ -1570,7 +1578,7 @@ cr.define('options.internet', function() {
       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';
@@ -1651,7 +1659,7 @@ cr.define('options.internet', function() {
       $('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';