Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4156)

Unified Diff: chrome/browser/chromeos/status/network_menu.cc

Issue 4102003: Do not require password for remembered wifi network. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/common
Patch Set: Untabify. Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/status/network_menu.h ('k') | chrome/browser/resources/network_menu.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/status/network_menu.cc
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index 4899bbd1ea758353d34f2a309db7bf773b7ae417..f408422b6f5675bb2573402eadfedfd39b82cfe7 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -148,11 +148,14 @@ bool NetworkMenu::GetNetworkAt(int index, NetworkInfo* info) const {
IDS_STATUSBAR_NETWORK_DEVICE_DISCONNECTED);
}
if (wifi.encrypted()) {
+ info->need_passphrase = true;
if (wifi.IsCertificateLoaded() ||
wifi.encryption() == SECURITY_8021X) {
info->need_passphrase = false;
- } else {
- info->need_passphrase = true;
+ }
+ if (wifi.favorite()) {
+ info->passphrase = wifi.passphrase();
+ info->need_passphrase = false;
}
} else {
info->need_passphrase = false;
« no previous file with comments | « chrome/browser/chromeos/status/network_menu.h ('k') | chrome/browser/resources/network_menu.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698