Index: ash/system/chromeos/network/network_connect.cc |
diff --git a/ash/system/chromeos/network/network_connect.cc b/ash/system/chromeos/network/network_connect.cc |
index b2b8f84abdf3a1608365d82dd3099d660785cc01..4013c7734972ba5e2996f87cc22a933577181470 100644 |
--- a/ash/system/chromeos/network/network_connect.cc |
+++ b/ash/system/chromeos/network/network_connect.cc |
@@ -4,6 +4,7 @@ |
#include "ash/system/chromeos/network/network_connect.h" |
+#include "ash/session_state_delegate.h" |
#include "ash/shell.h" |
#include "ash/system/chromeos/network/network_state_notifier.h" |
#include "ash/system/system_notifier.h" |
@@ -155,8 +156,10 @@ void OnConnectFailed(const std::string& service_path, |
chromeos::network_handler::kErrorDetail, &shill_error); |
ShowErrorNotification(error_name, shill_error, service_path); |
- // Show a configure dialog for ConnectFailed errors. |
- if (error_name != shill::kErrorConnectFailed) |
+ // Only show a configure dialog if there was a ConnectFailed error and the |
+ // screen is not locked. |
+ if (error_name != shill::kErrorConnectFailed || |
+ Shell::GetInstance()->session_state_delegate()->IsScreenLocked()) |
return; |
// If Shill reports an InProgress error, don't try to configure the network. |