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

Unified Diff: chrome/browser/chromeos/network_login_observer.cc

Issue 10409057: Remember user entered passwords for wimax and reshow dialog on bad passphrase. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't remember user passphrase Created 8 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/network_login_observer.cc
diff --git a/chrome/browser/chromeos/network_login_observer.cc b/chrome/browser/chromeos/network_login_observer.cc
index 75c651ab2fbad5a8db3417f5bc7a9520fe3d6c1d..1d96a6949659ccd00939f709688deaf906d45389 100644
--- a/chrome/browser/chromeos/network_login_observer.cc
+++ b/chrome/browser/chromeos/network_login_observer.cc
@@ -21,10 +21,8 @@ NetworkLoginObserver::~NetworkLoginObserver() {
}
void NetworkLoginObserver::OnNetworkManagerChanged(NetworkLibrary* cros) {
- const WifiNetworkVector& wifi_networks = cros->wifi_networks();
- const VirtualNetworkVector& virtual_networks = cros->virtual_networks();
-
// Check to see if we have any newly failed wifi network.
+ const WifiNetworkVector& wifi_networks = cros->wifi_networks();
for (WifiNetworkVector::const_iterator it = wifi_networks.begin();
it != wifi_networks.end(); it++) {
WifiNetwork* wifi = *it;
@@ -45,7 +43,30 @@ void NetworkLoginObserver::OnNetworkManagerChanged(NetworkLibrary* cros) {
}
}
}
+ // Check to see if we have any newly failed wimax network.
+ const WimaxNetworkVector& wimax_networks = cros->wimax_networks();
+ for (WimaxNetworkVector::const_iterator it = wimax_networks.begin();
+ it != wimax_networks.end(); it++) {
+ WimaxNetwork* wimax = *it;
+ if (wimax->notify_failure()) {
+ // Display login dialog again for bad_passphrase and bad_wepkey errors.
+ // Always re-display for user initiated connections that fail.
+ // Always re-display the login dialog for encrypted networks that were
+ // added and failed to connect for any reason.
+ VLOG(1) << "NotifyFailure: " << wimax->name()
+ << ", error: " << wimax->error()
+ << ", added: " << wimax->added();
+ if (wimax->error() == ERROR_BAD_PASSPHRASE ||
+ wimax->error() == ERROR_BAD_WEPKEY ||
+ wimax->connection_started() ||
+ (wimax->passphrase_required() && wimax->added())) {
+ NetworkConfigView::Show(wimax, NULL);
+ return; // Only support one failure per notification.
+ }
+ }
+ }
// Check to see if we have any newly failed virtual network.
+ const VirtualNetworkVector& virtual_networks = cros->virtual_networks();
for (VirtualNetworkVector::const_iterator it = virtual_networks.begin();
it != virtual_networks.end(); it++) {
VirtualNetwork* vpn = *it;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698