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 1210 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') ||
+          !onc.getActiveValue('Connectable')) {

[bartfab (slow), 2015/06/02 23:55:26]

The first part of the conditional makes sense of course. But I am not sure about
"!onc.getActiveValue('Connectable')". We would only ever reach that for
third-party VPNs. But there, showing the configuration dialog when the user
clicks "Connect" is always an error. The user has no way to connect from within
that dialog.

[stevenjb, 2015/06/03 01:14:57]

I guess the thing to do is to disable the Connect button for VPN when
Conenctable is false, I will change that.

+        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
   };
 });