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

chrome/browser/chromeos/dom_ui/internet_options_handler.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/dom_ui/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <string>
 #include <vector>
@@ skipping 140 matching lines @@
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_AUTO_CONNECT));
   localized_strings->SetString("inetCertPkcs",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_INSTALLED));
   localized_strings->SetString("inetLogin",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN));
   localized_strings->SetString("inetShowPass",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SHOWPASSWORD));
+  localized_strings->SetString("inetSecurityNone",
+      l10n_util::GetStringFUTF16(
+          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_SELECT,
+          l10n_util::GetStringUTF16(
+              IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_NONE)));
+  localized_strings->SetString("inetSecurityWEP",
+      l10n_util::GetStringFUTF16(
+          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_SELECT,
+          l10n_util::GetStringUTF16(
+              IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_WEP)));
+  localized_strings->SetString("inetSecurityWPA",
+      l10n_util::GetStringFUTF16(
+          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_SELECT,
+          l10n_util::GetStringUTF16(
+              IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_WPA)));
+  localized_strings->SetString("inetSecurityRSN",
+      l10n_util::GetStringFUTF16(
+          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_SELECT,
+          l10n_util::GetStringUTF16(
+              IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_RSN)));
   localized_strings->SetString("inetPassPrompt",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSWORD));
   localized_strings->SetString("inetSsidPrompt",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SSID));
   localized_strings->SetString("inetStatus",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_STATUS_TITLE));
   localized_strings->SetString("inetConnect",
@@ skipping 504 matching lines @@
     return;
   }
 
   chromeos::NetworkLibrary* cros =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   chromeos::WifiNetwork* network = cros->FindWifiNetworkByPath(service_path);
   if (network) {
     cros->ConnectToWifiNetwork(
         network, password, std::string(), std::string());
   } else {
-    // Must be an "other" login
-    cros->ConnectToWifiNetwork(
-        service_path, password, std::string(), std::string(), true);
+    // Network disappeared while the user is connecting to it.
+    // TODO(chocobo): Display error message.
+    LOG(WARNING) << "Cannot find network to connect " << service_path;
   }
 }
 
 void InternetOptionsHandler::LoginCertCallback(const ListValue* args) {
 
   std::string service_path;
   std::string identity;
   std::string certpath;
   std::string password;
 
@@ skipping 11 matching lines @@
       cros->FindWifiNetworkByPath(service_path);
   if (network) {
     cros->ConnectToWifiNetwork(
         network, password, identity, certpath);
   } else {
     // TODO(dhg): Send error back to UI
   }
 }
 
 void InternetOptionsHandler::LoginToOtherCallback(const ListValue* args) {
+  std::string security;
   std::string ssid;
   std::string password;
 
-  if (args->GetSize() != 2 ||
-      !args->GetString(0, &ssid) ||
-      !args->GetString(1, &password)) {
+  if (args->GetSize() != 3 ||
+      !args->GetString(0, &security) ||
+      !args->GetString(1, &ssid) ||
+      !args->GetString(2, &password)) {
     NOTREACHED();
     return;
   }
 
+  chromeos::ConnectionSecurity sec = chromeos::SECURITY_UNKNOWN;
+  if (security == "none") {
+    sec = chromeos::SECURITY_NONE;
+  } else if (security == "wep") {
+    sec = chromeos::SECURITY_WEP;
+  } else if (security == "wpa") {
+    sec = chromeos::SECURITY_WPA;
+  } else if (security == "rsn") {
+    sec = chromeos::SECURITY_RSN;
+  }
+
   chromeos::NetworkLibrary* cros =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
 
-  cros->ConnectToWifiNetwork(
-      ssid, password, std::string(), std::string(), true);
+  cros->ConnectToWifiNetwork(sec, ssid, password, std::string(), std::string(),
+                             true);
 }
 
 void InternetOptionsHandler::ButtonClickCallback(const ListValue* args) {
   std::string str_type;
   std::string service_path;
   std::string command;
   if (args->GetSize() != 3 ||
       !args->GetString(0, &str_type) ||
       !args->GetString(1, &service_path) ||
       !args->GetString(2, &command)) {
@@ skipping 183 matching lines @@
         (*it)->connected(),
         chromeos::TYPE_CELLULAR,
         false,
         (*it)->activation_state()));
   }
 
   // Add "Other..." if wifi is enabled.
   if (cros->wifi_enabled()) {
     list->Append(GetNetwork(
         kOtherNetworksFakePath,
-        SkBitmap(),
+        *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0_BLACK),
         l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_OTHER_NETWORKS),
         false,
         false,
         chromeos::TYPE_WIFI,
         false,
         chromeos::ACTIVATION_STATE_UNKNOWN));
   }
 
   return list;
 }
@@ skipping 18 matching lines @@
         icon,
         (*it)->name(),
         (*it)->connecting(),
         (*it)->connected(),
         chromeos::TYPE_WIFI,
         true,
         chromeos::ACTIVATION_STATE_UNKNOWN));
   }
   return list;
 }