Add login url to captive portal interstitial.

chrome/browser/captive_portal/captive_portal_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 223 matching lines @@
   DCHECK(state_ == STATE_TIMER_RUNNING || state_ == STATE_IDLE);
   DCHECK(!TimerRunning());
 
   state_ = STATE_CHECKING_FOR_PORTAL;
 
   // When not enabled, just claim there's an Internet connection.
   if (!enabled_) {
     // 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;
   }
 
   captive_portal_detector_.DetectCaptivePortal(
       test_url_, base::Bind(
           &CaptivePortalService::OnPortalDetectionCompleted,
           base::Unretained(this)));
 }
 
 void CaptivePortalService::OnPortalDetectionCompleted(
@@ skipping 45 matching lines @@
     ++num_checks_with_same_result_;
 
     // Requests that have the same Result as the last one are considered
     // "failures", to trigger backoff.
     backoff_entry_->SetCustomReleaseTime(now + retry_after_delta);
     backoff_entry_->InformOfRequest(false);
   }
 
   last_check_time_ = now;
 
-  OnResult(result);
+  OnResult(result, results.landing_url);
 }
 
 void CaptivePortalService::Shutdown() {
   DCHECK(CalledOnValidThread());
   if (enabled_) {
     RecordRepeatHistograms(
         last_detection_result_,
         num_checks_with_same_result_,
         GetCurrentTimeTicks() - first_check_time_with_same_result_);
   }
 }
 
-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(
       chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT,
       content::Source<Profile>(profile_),
       content::Details<Results>(&results));
 }
 
 void CaptivePortalService::ResetBackoffEntry(CaptivePortalResult result) {
   if (!enabled_ || result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL) {
@@ skipping 51 matching lines @@
     return time_ticks_for_testing_;
 }
 
 bool CaptivePortalService::DetectionInProgress() const {
   return state_ == STATE_CHECKING_FOR_PORTAL;
 }
 
 bool CaptivePortalService::TimerRunning() const {
   return check_captive_portal_timer_.IsRunning();
 }