Add third-party VPN support to network details dialog

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.
@@ skipping 739 matching lines @@
     },
 
     /**
      * 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 = onc.getTranslatedValue('Name');
+      $('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')
         typeKey = 'ethernetTitle';
       else if (type == 'WiFi')
         typeKey = 'wifiTitle';
@@ skipping 533 matching lines @@
     var onc = new OncData(oncData);
 
     var detailsPage = DetailsInternetPage.getInstance();
     detailsPage.servicePath_ = oncData.servicePath;
     detailsPage.onc_ = onc;
     var type = onc.getActiveValue('Type');
     detailsPage.type_ = type;
 
     sendShowDetailsMetrics(type, onc.getActiveValue('ConnectionState'));
 
+    if (type == '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(
+          oncData.VPNProviderID,

[stevenjb, 2015/03/15 17:00:08]

Don't use oncData directly, use onc.getActiveValue(VPNProviderID)

[bartfab (slow), 2015/03/16 10:04:51]

I had based this on existing code. It seemed to me that you were using
onc.getActiveValue(X) for real ONC properties and oncData.X for injected, fake
properties. I guess it makes sense to move to getActiveValue(X) for everything
now that we are trying to move over to real ONC properties throughout. Done.

+          onc.getTranslatedValue('Name'));
+    }

[stevenjb, 2015/03/15 17:00:08]

else detailsPage.networkTitle = undefined;

[bartfab (slow), 2015/03/16 10:04:51]

Done.

+
     detailsPage.populateHeader_();
     detailsPage.updateConnectionButtonVisibilty_();
     detailsPage.updateDetails_();
 
     // TODO(stevenjb): Some of the setup below should be moved to
     // updateDetails_() so that updates are reflected in the UI.
 
     // Only show proxy for remembered networks.
     var remembered = onc.getSource() != 'None';
     if (remembered) {
@@ skipping 308 matching lines @@
       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'));
+      var providers = options.VPNProviders;
+      var providerID = oncData.VPNProviderID;

[stevenjb, 2015/03/15 17:00:08]

Use onc.getActiveValue

[bartfab (slow), 2015/03/16 10:04:51]

Done.

+      $('vpn-tab').classList.toggle('third-party-vpn-provider',
+                                    providers.isThirdPartyProvider(providerID));
+
       $('inet-service-name').textContent = networkName;
       $('inet-provider-type').textContent =
           onc.getTranslatedValue('VPN.Type');
       var providerType = onc.getActiveValue('VPN.Type');
       var usernameKey;
       if (providerType == 'OpenVPN')
         usernameKey = 'VPN.OpenVPN.Username';
       else if (providerType == 'L2TP-IPsec')
         usernameKey = 'VPN.L2TP.Username';
 
       if (usernameKey) {
         $('inet-username').parentElement.hidden = false;
         $('inet-username').textContent = onc.getActiveValue(usernameKey);
       } else {
         $('inet-username').parentElement.hidden = true;
       }
       var inetServerHostname = $('inet-server-hostname');
       inetServerHostname.value = onc.getActiveValue('VPN.Host');
       inetServerHostname.resetHandler = function() {
         PageManager.hideBubble();
         var recommended = onc.getRecommendedValue('VPN.Host');
         if (recommended != undefined)
           inetServerHostname.value = recommended;
       };
       $('auto-connect-network-vpn').checked =
           onc.getActiveValue('VPN.AutoConnect');
       $('auto-connect-network-vpn').disabled = false;
+      $('inet-provider-name').textContent =
+          providers.getProviders()[providerID];
     } else {
       OptionsPage.showTab($('internet-nav-tab'));
     }
 
     // Update controlled option indicators.
     var indicators = cr.doc.querySelectorAll(
         '#details-internet-page .controlled-setting-indicator');
     for (var i = 0; i < indicators.length; i++) {
       var managed = indicators[i].hasAttribute('managed');
       // TODO(stevenjb): Eliminate support for 'data' once 39 is stable.
@@ skipping 28 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
   };
 });