Index: chrome/browser/chromeos/net/network_portal_detector_impl.cc |
diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl.cc b/chrome/browser/chromeos/net/network_portal_detector_impl.cc |
index b4691cdd4f7e92e6ed87b1cbacbae275e4599dad..fb8c84c03ae33447f0c0e83fb40f5b42ba4791b4 100644 |
--- a/chrome/browser/chromeos/net/network_portal_detector_impl.cc |
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl.cc |
@@ -550,8 +550,10 @@ void NetworkPortalDetectorImpl::OnAttemptCompleted( |
OnDetectionCompleted(network, state); |
} |
- // Observers (via OnDetectionCompleted) may already schedule new attempt. |
- if (is_idle()) |
+ // Do not schedule attempt if Observers (via OnDetectionCompleted) already |
+ // schedule new attempt or we are already behind captive portal, which can be |
stevenjb
2017/03/17 00:26:46
nit: 'has already scheduled a new attempt', 'behin
|
+ // either the result of NetworkPortalDetector or shill's detection. |
+ if (is_idle() && state.status != CAPTIVE_PORTAL_STATUS_PORTAL) |
ScheduleAttempt(results.retry_after_delta); |
} |