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

Unified Diff: chrome/browser/chromeos/net/network_portal_detector_impl.cc

Issue 2756643002: cros: Do not schedule attempt when behind captive portal with response 200 is detected (Closed)
Patch Set: Created 3 years, 9 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698