Commit 620db8a9 authored by meacer@chromium.org's avatar meacer@chromium.org

Don't log captive portal events in SSL interstitial if detection is disabled.

BUG=335933

Review URL: https://codereview.chromium.org/214873003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260447 0039d316-1c4b-4281-b951-d872f2087c98
parent 85d16eb9
...@@ -517,6 +517,10 @@ void SSLBlockingPage::Observe( ...@@ -517,6 +517,10 @@ void SSLBlockingPage::Observe(
const content::NotificationSource& source, const content::NotificationSource& source,
const content::NotificationDetails& details) { const content::NotificationDetails& details) {
#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
// When detection is disabled, captive portal service always sends
// RESULT_INTERNET_CONNECTED. Ignore any probe results in that case.
if (!captive_portal_detection_enabled_)
return;
if (type == chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT) { if (type == chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT) {
captive_portal_probe_completed_ = true; captive_portal_probe_completed_ = true;
captive_portal::CaptivePortalService::Results* results = captive_portal::CaptivePortalService::Results* results =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment