Do not always attempt to configure third party VPNs

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 719 matching lines @@
       var onc = this.onc_;
       if (this.type_ == '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 connectable = onc.getActiveValue('Connectable');
       var connectState = onc.getActiveValue('ConnectionState');
       if (connectState == 'NotConnected') {
+        $('details-internet-disconnect').hidden = true;
         $('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;
+        // Connect button for built-in networks.
+        var enabled = (this.type_ != 'VPN') ||
+                      (onc.getActiveValue('VPN.Type') != 'ThirdPartyVPN') ||
+                      connectable;
+        $('details-internet-login').disabled = !enabled;
       } else {
         $('details-internet-login').hidden = true;
         $('details-internet-disconnect').hidden = false;
       }
 
       var showConfigure = false;
-      var connectable = onc.getActiveValue('Connectable');
       if (this.type_ == 'WiMAX' || this.type_ == 'VPN') {
         showConfigure = true;
       } else if (this.type_ == 'WiFi') {
         showConfigure = (connectState != 'Connected' &&
                          (!connectable || onc.getWiFiSecurity() != 'None'));
       }
       $('details-internet-configure').hidden = !showConfigure;
     },
 
     /**
@@ skipping 456 matching lines @@
     var detailsPage = DetailsInternetPage.getInstance();
     if (detailsPage.type_ == 'WiFi')
       sendChromeMetricsAction('Options_NetworkConnectToWifi');
     else if (detailsPage.type_ == 'VPN')
       sendChromeMetricsAction('Options_NetworkConnectToVPN');
 
     var onc = detailsPage.onc_;
     var guid = onc.guid();
     var type = onc.getActiveValue('Type');
 
-    // VPNs do not correctly set 'Connectable', so we always show the
+    // Built-in VPNs do not correctly set 'Connectable', so we always show the
     // configuration UI.
     if (type == 'VPN') {
-      chrome.send('configureNetwork', [guid]);
-      return;
+      if (onc.getActiveValue('VPN.Type') != 'ThirdPartyVPN') {
+        chrome.send('configureNetwork', [guid]);
+        return;
+      }
     }
 
     // If 'Connectable' is false for WiFi or WiMAX, Shill requires
     // additional configuration to connect, so show the configuration UI.
     if ((type == 'WiFi' || type == 'WiMAX') &&
         !onc.getActiveValue('Connectable')) {
       chrome.send('configureNetwork', [guid]);
       return;
     }
 
@@ skipping 602 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
   };
 });