Add support for different type of encyrption when adding a network....

chrome/browser/chromeos/cros/network_library.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/chromeos/cros/network_library.h"
 
 #include <algorithm>
 #include <map>
 
 #include "app/l10n_util.h"
@@ skipping 688 matching lines @@
         wifi->set_passphrase(password);
         wifi->set_identity(identity);
         wifi->set_cert_path(certpath);
         wifi->set_connecting(true);
         wifi_ = wifi;
       }
       NotifyNetworkChanged();
     }
   }
 
-  virtual void ConnectToWifiNetwork(const std::string& ssid,
+  virtual void ConnectToWifiNetwork(ConnectionSecurity security,
+                                    const std::string& ssid,
                                     const std::string& password,
                                     const std::string& identity,
                                     const std::string& certpath,
                                     bool auto_connect) {
     if (!EnsureCrosLoaded())
       return;
 
     // First create a service from hidden network.
-    ConnectionSecurity security = password.empty() ?
-        SECURITY_NONE : SECURITY_UNKNOWN;
     ServiceInfo* service = GetWifiService(ssid.c_str(), security);
     if (service) {
       // Set auto-connect.
       SetAutoConnect(service->service_path, auto_connect);
       // Now connect to that service.
       ConnectToNetworkWithCertInfo(service->service_path,
           password.empty() ? NULL : password.c_str(),
           identity.empty() ? NULL : identity.c_str(),
           certpath.empty() ? NULL : certpath.c_str());
 
@@ skipping 668 matching lines @@
       const std::string& path) { return NULL; }
   virtual void RequestWifiScan() {}
   virtual bool GetWifiAccessPoints(WifiAccessPointVector* result) {
     return false;
   }
 
   virtual void ConnectToWifiNetwork(const WifiNetwork* network,
                                     const std::string& password,
                                     const std::string& identity,
                                     const std::string& certpath) {}
-  virtual void ConnectToWifiNetwork(const std::string& ssid,
+  virtual void ConnectToWifiNetwork(ConnectionSecurity security,
+                                    const std::string& ssid,
                                     const std::string& password,
                                     const std::string& identity,
                                     const std::string& certpath,
                                     bool auto_connect) {}
   virtual void ConnectToCellularNetwork(const CellularNetwork* network) {}
   virtual void RefreshCellularDataPlans(const CellularNetwork* network) {}
   virtual void DisconnectFromWirelessNetwork(const WirelessNetwork* network) {}
   virtual void SaveCellularNetwork(const CellularNetwork* network) {}
   virtual void SaveWifiNetwork(const WifiNetwork* network) {}
   virtual void ForgetWifiNetwork(const std::string& service_path) {}
@@ skipping 31 matching lines @@
     return new NetworkLibraryStubImpl();
   else
     return new NetworkLibraryImpl();
 }
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::NetworkLibraryImpl);