Index: chrome/browser/chromeos/cros/network_library_impl_cros.cc |
diff --git a/chrome/browser/chromeos/cros/network_library_impl_cros.cc b/chrome/browser/chromeos/cros/network_library_impl_cros.cc |
index 27b00859b615d5ea39cd7bd2991dd1ff72cabaee..366ef3a3e3ecb30481362d16ae645924810d892b 100644 |
--- a/chrome/browser/chromeos/cros/network_library_impl_cros.cc |
+++ b/chrome/browser/chromeos/cros/network_library_impl_cros.cc |
@@ -839,11 +839,16 @@ void NetworkLibraryImplCros::UpdateNetworkServiceList( |
<< " State = " << network->GetStateString() |
<< " connecting = " << network->connecting() |
<< " connection_started = " << network->connection_started(); |
+ WifiNetwork* wifi = NULL; |
+ if (network->type() == TYPE_WIFI) |
+ wifi = static_cast<WifiNetwork*>(network); |
if (network->failed() && network->notify_failure()) { |
// We have not notified observers of a connection failure yet. |
AddNetwork(network); |
- } else if (network->connecting() && network->connection_started()) { |
- // Network was in connecting state; set state to failed. |
+ } else if (network->connecting() && network->connection_started() && |
+ !(wifi && wifi->hidden_ssid())) { |
Paul Stewart
2012/07/31 20:21:32
This says we should disable this check for all non
Greg Spencer (Chromium)
2012/07/31 20:27:10
No that's not the correct interpretation, because
Paul Stewart
2012/07/31 20:29:52
Sorry. Yeah, that's right.
|
+ // Network was in connecting state; set state to failed, but not if it |
+ // had a hidden SSID (since that won't appear in the scanning list). |
VLOG(2) << "Removed network was connecting: " << network->name(); |
network->SetState(STATE_FAILURE); |
AddNetwork(network); |