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

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

Issue 7633046: Fix VPN icon issues (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix mock expectations. Created 9 years, 4 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/cros/network_library.cc ('k') | chrome/browser/chromeos/options/vpn_config_view.cc » ('j') | 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 02c71eba47fe908128853a3d601134dc02278cc2..449c070ea02a8e1633257bf0534a1833e92aabd6 100644
--- a/chrome/browser/chromeos/network_login_observer.cc
+++ b/chrome/browser/chromeos/network_login_observer.cc
@@ -70,9 +70,13 @@ void NetworkLoginObserver::OnNetworkManagerChanged(NetworkLibrary* cros) {
it != virtual_networks.end(); it++) {
VirtualNetwork* vpn = *it;
if (vpn->notify_failure()) {
- // Display login dialog again for bad_passphrase and errors.
+ // Display login dialog for bad_passphrase or connect_failed. VPN does
+ // not store user name or other properties, so may need additional info
+ // for a configured network.
// Always re-display the login dialog for newly added networks.
- if (vpn->error() == ERROR_BAD_PASSPHRASE || vpn->added()) {
+ if (vpn->error() == ERROR_BAD_PASSPHRASE ||
+ vpn->error() == ERROR_CONNECT_FAILED ||
+ vpn->added()) {
CreateModalPopup(new NetworkConfigView(vpn));
return; // Only support one failure per notification.
}
« no previous file with comments | « chrome/browser/chromeos/cros/network_library.cc ('k') | chrome/browser/chromeos/options/vpn_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698