Use networkingPrivate.startConnect (Take 2)

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 1171 matching lines @@
       if (hostValue.indexOf(':') !== -1) {
         if (hostValue.match(/:/g).length == 1) {
           hostValue = hostValue.split(':');
           $(proxyHost).value = hostValue[0];
           $(proxyPort).value = hostValue[1];
         }
       }
   };
 
   DetailsInternetPage.loginFromDetails = function() {
+    DetailsInternetPage.configureOrConnect();
+    PageManager.closeOverlay();
+  };
+
+  /**
+   * This function identifies unconfigured networks and networks that are
+   * likely to fail (e.g. due to a bad passphrase on a previous connect
+   * attempt). For such networks a configure dialog will be opened. Otherwise
+   * a connection will be attempted.
+   */
+  DetailsInternetPage.configureOrConnect = function() {
     var detailsPage = DetailsInternetPage.getInstance();
     if (detailsPage.type_ == 'WiFi')
       sendChromeMetricsAction('Options_NetworkConnectToWifi');
     else if (detailsPage.type_ == 'VPN')
       sendChromeMetricsAction('Options_NetworkConnectToVPN');
-    // TODO(stevenjb): chrome.networkingPrivate.startConnect
-    chrome.send('startConnect', [detailsPage.onc_.guid()]);
-    PageManager.closeOverlay();
+
+    var onc = detailsPage.onc_;
+    var guid = onc.guid();
+    var type = onc.getActiveValue('Type');
+
+    // VPNs do not correctly set 'Connectable', so we always show the
+    // configuration UI.
+    if (type == 'VPN') {
+      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;
+    }
+
+    // Secure WiFi networks with ErrorState set most likely require
+    // configuration (e.g. a correct passphrase) before connecting.
+    if (type == 'WiFi' && onc.getWiFiSecurity() != 'None') {
+      var errorState = onc.getActiveValue('ErrorState');
+      if (errorState && errorState != 'Unknown') {
+        chrome.send('configureNetwork', [guid]);
+        return;
+      }
+    }
+
+    // Cellular networks need to be activated before they can be connected to.
+    if (type == 'Cellular') {
+      var activationState = onc.getActiveValue('Cellular.ActivationState');
+      if (activationState != 'Activated' && activationState != 'Unknown') {
+        DetailsInternetPage.activateCellular(guid);
+        return;
+      }
+    }
+
+    chrome.networkingPrivate.startConnect(guid);
   };
 
   DetailsInternetPage.disconnectNetwork = function() {
     var detailsPage = DetailsInternetPage.getInstance();
     if (detailsPage.type_ == 'WiFi')
       sendChromeMetricsAction('Options_NetworkDisconnectWifi');
     else if (detailsPage.type_ == 'VPN')
       sendChromeMetricsAction('Options_NetworkDisconnectVPN');
     chrome.networkingPrivate.startDisconnect(detailsPage.onc_.guid());
     PageManager.closeOverlay();
@@ skipping 575 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
   };
 });