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

Unified Diff: chrome/browser/captive_portal/captive_portal_service.cc

Issue 861953002: Add login url to captive portal interstitial. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mmenke comments Created 5 years, 11 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
Index: chrome/browser/captive_portal/captive_portal_service.cc
diff --git a/chrome/browser/captive_portal/captive_portal_service.cc b/chrome/browser/captive_portal/captive_portal_service.cc
index dd3bff4daac51d9d21be2f9d3ff96712b3caa177..6098d80e8a4294da5aef8756163adcd688db26d8 100644
--- a/chrome/browser/captive_portal/captive_portal_service.cc
+++ b/chrome/browser/captive_portal/captive_portal_service.cc
@@ -241,7 +241,7 @@ void CaptivePortalService::DetectCaptivePortalInternal() {
// Count this as a success, so the backoff entry won't apply exponential
// backoff, but will apply the standard delay.
backoff_entry_->InformOfRequest(true);
- OnResult(captive_portal::RESULT_INTERNET_CONNECTED);
+ OnResult(captive_portal::RESULT_INTERNET_CONNECTED, GURL());
return;
}
@@ -307,7 +307,7 @@ void CaptivePortalService::OnPortalDetectionCompleted(
last_check_time_ = now;
- OnResult(result);
+ OnResult(result, results.landing_url);
}
void CaptivePortalService::Shutdown() {
@@ -320,13 +320,15 @@ void CaptivePortalService::Shutdown() {
}
}
-void CaptivePortalService::OnResult(CaptivePortalResult result) {
+void CaptivePortalService::OnResult(CaptivePortalResult result,
+ const GURL& landing_url) {
DCHECK_EQ(STATE_CHECKING_FOR_PORTAL, state_);
state_ = STATE_IDLE;
Results results;
results.previous_result = last_detection_result_;
results.result = result;
+ results.landing_url = landing_url;
last_detection_result_ = result;
content::NotificationService::current()->Notify(

Powered by Google App Engine
This is Rietveld 408576698