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

[stev...@chromium.org]

Reviewers: James Cook (Chromium), Charlie Lee,

Message:
I spoke with Sam about the UI and we agreed that there is no need for
separate
entries for RSN or WPA, but that the PSK option should mention RSN and WPA
for
users who are unaware that WPA is a superset of RSN and WPA.

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

BUG=chromium-os:13333
TEST=Network Menu > Other Wi-Fi Network > Security should have WEP and PSK.
Both
should still work. PSK should work for both RSN and WPA networks.

Please review this at http://codereview.chromium.org/7107005/

SVN Base: svn://svn.chromium.org/chrome/trunk/src

Affected files:
M chrome/app/generated_resources.grd
M chrome/browser/chromeos/options/wifi_config_view.cc

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd
b/chrome/app/generated_resources.grd
index
1851bc197ca8e7e15d6df78bc0e5f800f90d4d04..af1dff0c01e835054b64437207c39d7846b4c77c
100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -10586,6 +10586,9 @@ Keep your key file in a safe place. You will need
it to create new versions of y
<message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_RSN"
desc="In settings Internet options, a string specifying security RSN.">
RSN
</message>
+ <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_PSK"
desc="In settings Internet options, a string specifying security PSK
(either WPA-PSK or RSN-PSK).">
+ PSK (WPA or RSN)
+ </message>
<message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSWORD"
desc="In settings Internet options, a string telling the user where the
network certificate is installed to.">
Password
</message>
Index: chrome/browser/chromeos/options/wifi_config_view.cc
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc
b/chrome/browser/chromeos/options/wifi_config_view.cc
index
ed273faf768243c886e5fe948643b8602d80c43a..2e8ed5b00a0e16d362eef0bad20c57e4fe5efbf4
100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -35,9 +35,8 @@ bool Is8021x(const WifiNetwork* wifi) {
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 {
@@ -54,12 +53,9 @@ class SecurityComboboxModel : public ui::ComboboxModel {
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();
}
@@ -441,11 +437,8 @@ bool WifiConfigView::Login() {
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());

[cho...@chromium.org]

is it still ok to add new strings?

http://codereview.chromium.org/7107005/diff/1/chrome/app/generated_resources.grd
File chrome/app/generated_resources.grd (right):

http://codereview.chromium.org/7107005/diff/1/chrome/app/generated_resources.grd#newcode10583
chrome/app/generated_resources.grd:10583: <message
name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_WPA" desc="In
settings Internet options, a string specifying security WPA.">
delete wpa and rsn?

http://codereview.chromium.org/7107005/

[jame...@chromium.org]

http://codereview.chromium.org/7107005/diff/1/chrome/app/generated_resources.grd
File chrome/app/generated_resources.grd (right):

http://codereview.chromium.org/7107005/diff/1/chrome/app/generated_resources.grd#newcode10590
chrome/app/generated_resources.grd:10590: PSK (WPA or RSN)
End-user documentation about Wi-Fi security often refers to "WPA" or
"WPA2" as a choice when connecting to a network. I think it would be a
good idea to have an item in the menu labeled "WPA" or "WPA-PSK".
Regardless of how it's implemented under the hood, end users are going
to look for matching strings. Are you sure these options need to be
collapsed together?

For example, here's what Netgear's Wi-Fi router config page looks like:
http://support.netgear.com/app/answers/detail/a_id/112

http://codereview.chromium.org/7107005/

[stev...@chromium.org]

I pinged Zel and he would rather push the change than wait. If we don't get
this
translated, it's not a major concern.

http://codereview.chromium.org/7107005/diff/1/chrome/app/generated_resources.grd
File chrome/app/generated_resources.grd (right):

http://codereview.chromium.org/7107005/diff/1/chrome/app/generated_resources.grd#newcode10583

chrome/app/generated_resources.grd:10583: <message
name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_WPA" desc="In
settings Internet options, a string specifying security WPA.">

On 2011/06/01 23:03:06, Charlie Lee wrote:
> delete wpa and rsn?

Done.

http://codereview.chromium.org/7107005/diff/1/chrome/app/generated_resources.grd#newcode10590
chrome/app/generated_resources.grd:10590: PSK (WPA or RSN)

On 2011/06/01 23:24:22, James Cook (Chromium) wrote:
> End-user documentation about Wi-Fi security often refers to "WPA" or
"WPA2" as a
> choice when connecting to a network. I think it would be a good idea
to have an
> item in the menu labeled "WPA" or "WPA-PSK". Regardless of how it's
implemented
> under the hood, end users are going to look for matching strings. Are
you sure
> these options need to be collapsed together?

> For example, here's what Netgear's Wi-Fi router config page looks
like:
> http://support.netgear.com/app/answers/detail/a_id/112

Sam and I went back and forth on this. It's confusing any way you do it.
If we have "WPA" and "PSK" and the user is looking for "WPA-PSK" that's
also confusing.

We ended up with one entry that includes "PSK", "WPA", and "RSN", so
hopefully anyone setting up a hidden network will recognize one of those
and choose that option.

It is entirely possible that we will iterate on this based on feedback.

http://codereview.chromium.org/7107005/

[cho...@chromium.org]

LGTM

http://codereview.chromium.org/7107005/