Add ONC 'Source' configuration property

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 361 matching lines @@
         event.value.controlledBy = 'policy';
       }
 
       return event;
     },
 
     /**
      * Update details page controls.
      */
     updateControls: function() {
+      var onc = this.onc_;
+
       // Only show ipconfig section if network is connected OR if nothing on
       // this device is connected. This is so that you can fix the ip configs
       // if you can't connect to any network.
       // TODO(chocobo): Once ipconfig is moved to flimflam service objects,
       //   we need to redo this logic to allow configuration of all networks.
-      $('ipconfig-section').hidden = !this.connected && this.deviceConnected;
-      $('ipconfig-dns-section').hidden =
-        !this.connected && this.deviceConnected;
+      var connected = onc.getActiveValue('ConnectionState') == 'Connected';
+      $('ipconfig-section').hidden = !connected && this.deviceConnected;
+      $('ipconfig-dns-section').hidden = !connected && this.deviceConnected;
 
       // Network type related.
       updateHidden('#details-internet-page .cellular-details',
                    this.type_ != 'Cellular');
       updateHidden('#details-internet-page .wifi-details',
                    this.type_ != 'WiFi');
       updateHidden('#details-internet-page .wimax-details',
                    this.type_ != 'Wimax');
       updateHidden('#details-internet-page .vpn-details', this.type_ != 'VPN');
       updateHidden('#details-internet-page .proxy-details', !this.showProxy);
 
       // Cellular
 
       // Conditionally call updateHidden on .gsm-only, so that we don't unhide
       // a previously hidden element.
       if (this.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');
 
       // Password and shared.
+      var source = onc.getSource();
+      var shared = source == 'Device';

[pneubeck (no reviews), 2014/09/09 19:35:31]

previously the meaning of shared was 
  source != 'User'

i.e. the shared message was also shown for unconfigured networks?

[stevenjb, 2014/09/10 00:00:55]

That was deliberate, I think the new logic is better.

       updateHidden('#details-internet-page #password-details',
-                   this.type_ != 'WiFi' || !this.hasSecurity);
-      updateHidden('#details-internet-page #wifi-shared-network',
-          !this.shared);
-      updateHidden('#details-internet-page #prefer-network',
-                   !this.showPreferred);
+                   this.type_ != 'WiFi' || onc.getWiFiSecurity() == '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',
-                   !this.shared);
+      updateHidden('#details-internet-page #wimax-shared-network', !shared);
 
       // Proxy
       this.updateProxyBannerVisibility_();
       this.toggleSingleProxy_();
       if ($('manual-proxy').checked)
         this.enableManualProxy_();
       else
         this.disableManualProxy_();
     },
 
@@ skipping 134 matching lines @@
         // 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 || this.hasSecurity ||
+          (!connectable || onc.getWiFiSecurity() != 'None' ||
           (this.type_ == 'Wimax' || this.type_ == 'VPN'))) {
         $('details-internet-configure').hidden = false;
       } else {
         $('details-internet-configure').hidden = true;
       }
     },
 
     populateHeader_: function() {
       var onc = this.onc_;
 
       $('network-details-title').textContent = onc.getTranslatedValue('Name');
       var connectionState = onc.getActiveValue('ConnectionState');
       var connectionStateString = onc.getTranslatedValue('ConnectionState');
-      this.connected = connectionState == 'Connected';
       $('network-details-subtitle-status').textContent = connectionStateString;
       var typeKey;
       var type = this.type_;
       if (type == 'Ethernet')
         typeKey = 'ethernetTitle';
       else if (type == 'WiFi')
         typeKey = 'wifiTitle';
       else if (type == 'Wimax')
         typeKey = 'wimaxTitle';
       else if (type == 'Cellular')
@@ skipping 411 matching lines @@
     // Update our cached data object.
     var onc = detailsPage.onc_;
     onc.updateData(update);
 
     detailsPage.populateHeader_();
 
     var connectionState = onc.getActiveValue('ConnectionState');
     var connectionStateString = onc.getTranslatedValue('ConnectionState');
     if ('deviceConnected' in update)
       detailsPage.deviceConnected = update.deviceConnected;
-    detailsPage.connected = connectionState == 'Connected';
     $('connection-state').textContent = connectionStateString;
 
     detailsPage.updateConnectionButtonVisibilty_();
 
     var type = detailsPage.type_;
     if (type == 'WiFi') {
       $('wifi-connection-state').textContent = connectionStateString;
     } else if (type == 'Wimax') {
       $('wimax-connection-state').textContent = connectionStateString;
     } else if (type == 'Cellular') {
@@ skipping 26 matching lines @@
     detailsPage.populateHeader_();
 
     $('activate-details').hidden = true;
     $('view-account-details').hidden = true;
 
     detailsPage.updateConnectionButtonVisibilty_();
 
     $('web-proxy-auto-discovery').hidden = true;
 
     detailsPage.deviceConnected = data.deviceConnected;
-    detailsPage.connected =
-        onc.getActiveValue('ConnectionState') == 'Connected';
 
     // Only show proxy for remembered networks.
-    if (data.remembered) {
+    var remembered = onc.getSource() != 'None';
+    if (remembered) {
       detailsPage.showProxy = true;
       chrome.send('selectNetwork', [detailsPage.servicePath_]);
     } else {
       detailsPage.showProxy = false;
     }
 
     var connectionStateString = onc.getTranslatedValue('ConnectionState');
     $('connection-state').textContent = connectionStateString;
     var restricted = onc.getActiveValue('RestrictedConnectivity');
     var restrictedString = loadTimeData.getString(
@@ skipping 135 matching lines @@
     var macAddress = onc.getActiveValue('MacAddress');
     if (macAddress) {
       $('hardware-address').textContent = macAddress;
       $('hardware-address-row').style.display = 'table-row';
     } else {
       // This is most likely a device without a hardware address.
       $('hardware-address-row').style.display = 'none';
     }
 
     var setOrHideParent = function(field, property) {
-      if (property) {
+      if (property != undefined) {
         $(field).textContent = property;
         $(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')
       signalStrength = onc.getActiveValue(type + '.SignalStrength');
     if (!signalStrength)
       signalStrength = 0;
     var strengthFormat = loadTimeData.getString('inetSignalStrengthFormat');
     var strengthString = strengthFormat.replace('$1', signalStrength);
 
     if (type == 'WiFi') {
       OptionsPage.showTab($('wifi-network-nav-tab'));
       detailsPage.gsm = false;
-      detailsPage.shared = data.shared;
       $('wifi-connection-state').textContent = connectionStateString;
       $('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.getActiveValue('WiFi.Security');
+      var security = onc.getWiFiSecurity();
       if (security == 'None')
         security = undefined;

[pneubeck (no reviews), 2014/09/09 19:35:31]

this is somehow the inverse of the new function :-)

[stevenjb, 2014/09/10 00:00:55]

Yes, I know, but I don't like getWiFiSecurity returning undefined, that seems
awkward. The logic for setOrHodeParent hides undefined properties, and we don't
want to show 'Security: None'.

       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'));
-      detailsPage.showPreferred = data.remembered;
       var priority = onc.getActiveValue('Priority');
       $('prefer-network-wifi').checked = priority > 0;
-      $('prefer-network-wifi').disabled = !data.remembered;
+      $('prefer-network-wifi').disabled = !remembered;
       $('auto-connect-network-wifi').checked =
           onc.getActiveValue('AutoConnect');
-      $('auto-connect-network-wifi').disabled = !data.remembered;
-      detailsPage.hasSecurity = security != undefined;
+      $('auto-connect-network-wifi').disabled = !remembered;
     } else if (type == 'Wimax') {
       OptionsPage.showTab($('wimax-network-nav-tab'));
       detailsPage.gsm = false;
-      detailsPage.shared = data.shared;
-      detailsPage.showPreferred = data.remembered;
       $('wimax-connection-state').textContent = connectionStateString;
       $('wimax-restricted-connectivity').textContent = restrictedString;
       $('auto-connect-network-wimax').checked =
           onc.getActiveValue('AutoConnect');
-      $('auto-connect-network-wimax').disabled = !data.remembered;
+      $('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) {
@@ skipping 125 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
   };
 });