Replace WPA and RSN with PSK in Other Wi-Fi network UI.

chrome/browser/chromeos/options/wifi_config_view.cc

 // Copyright (c) 2011 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/options/wifi_config_view.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ skipping 17 matching lines @@
 namespace {
 
 // Returns true if network is known to require 802.1x.
 bool Is8021x(const WifiNetwork* wifi) {
   return wifi && wifi->encrypted() && wifi->encryption() == SECURITY_8021X;
 }
 
 enum SecurityComboboxIndex {
   SECURITY_INDEX_NONE  = 0,
   SECURITY_INDEX_WEP   = 1,
-  SECURITY_INDEX_WPA   = 2,
-  SECURITY_INDEX_RSN   = 3,
-  SECURITY_INDEX_COUNT = 4
+  SECURITY_INDEX_PSK   = 2,
+  SECURITY_INDEX_COUNT = 3
 };
 
 class SecurityComboboxModel : public ui::ComboboxModel {
  public:
   SecurityComboboxModel() {}
   virtual ~SecurityComboboxModel() {}
   virtual int GetItemCount() {
     return SECURITY_INDEX_COUNT;
   }
   virtual string16 GetItemAt(int index) {
     if (index == SECURITY_INDEX_NONE)
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_NONE);
     else if (index == SECURITY_INDEX_WEP)
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_WEP);
-    else if (index == SECURITY_INDEX_WPA)
+    else if (index == SECURITY_INDEX_PSK)
       return l10n_util::GetStringUTF16(
-          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_WPA);
-    else if (index == SECURITY_INDEX_RSN)
-      return l10n_util::GetStringUTF16(
-          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_RSN);
+          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_PSK);
     NOTREACHED();
     return string16();
   }
  private:
   DISALLOW_COPY_AND_ASSIGN(SecurityComboboxModel);
 };
 
 // Methods in alphabetical order.
 enum EAPMethodComboboxIndex {
   EAP_METHOD_INDEX_NONE  = 0,
@@ skipping 361 matching lines @@
     if (!eap_method_combobox_) {
       // Hidden ordinary Wi-Fi connection.
       ConnectionSecurity sec = SECURITY_UNKNOWN;
       switch (security_combobox_->selected_item()) {
         case SECURITY_INDEX_NONE:
           sec = SECURITY_NONE;
           break;
         case SECURITY_INDEX_WEP:
           sec = SECURITY_WEP;
           break;
-        case SECURITY_INDEX_WPA:
-          sec = SECURITY_WPA;
-          break;
-        case SECURITY_INDEX_RSN:
-          sec = SECURITY_RSN;
+        case SECURITY_INDEX_PSK:
+          sec = SECURITY_PSK;
           break;
       }
       cros->ConnectToWifiNetwork(GetSsid(), sec, GetPassphrase());
     } else {
       // Hidden 802.1X EAP Wi-Fi connection.
       cros->ConnectToWifiNetwork8021x(
           GetSsid(), GetEapMethod(), GetEapPhase2Auth(),
           GetEapServerCaCertNssNickname(), GetEapUseSystemCas(),
           GetEapClientCertPkcs11Id(), GetEapIdentity(),
           GetEapAnonymousIdentity(), GetPassphrase(),
@@ skipping 446 matching lines @@
   // Set focus to a reasonable widget, depending on what we're showing.
   if (ssid_textfield_)
     ssid_textfield_->RequestFocus();
   else if (eap_method_combobox_)
     eap_method_combobox_->RequestFocus();
   else if (passphrase_textfield_ && passphrase_textfield_->IsEnabled())
     passphrase_textfield_->RequestFocus();
 }
 
 }  // namespace chromeos