summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-08 21:00:56 +0000
committerchocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-08 21:00:56 +0000
commit66571c11d0b9c876158d48f2cba143a78c7248b6 (patch)
treea2a0bcd0c07ac96cb400a1dafa5a0463fb7f0e1c
parent7e56010853309e90693023fe9f0c5a1c086840dc (diff)
downloadchromium_src-66571c11d0b9c876158d48f2cba143a78c7248b6.zip
chromium_src-66571c11d0b9c876158d48f2cba143a78c7248b6.tar.gz
chromium_src-66571c11d0b9c876158d48f2cba143a78c7248b6.tar.bz2
Re-display network connection dialog when a user-initiated connection fails.
BUG=chromium-os:23518 Review URL: https://chromiumcodereview.appspot.com/8799019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125681 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/network_login_observer.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/network_login_observer.cc b/chrome/browser/chromeos/network_login_observer.cc
index 55814a0..0956f77 100644
--- a/chrome/browser/chromeos/network_login_observer.cc
+++ b/chrome/browser/chromeos/network_login_observer.cc
@@ -56,10 +56,12 @@ void NetworkLoginObserver::OnNetworkManagerChanged(NetworkLibrary* cros) {
WifiNetwork* wifi = *it;
if (wifi->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.
if (wifi->error() == ERROR_BAD_PASSPHRASE ||
wifi->error() == ERROR_BAD_WEPKEY ||
+ wifi->connection_started() ||
(wifi->encrypted() && wifi->added())) {
CreateModalPopup(new NetworkConfigView(wifi));
return; // Only support one failure per notification.