| Index: chrome/browser/ssl/ssl_blocking_page.h
|
| diff --git a/chrome/browser/ssl/ssl_blocking_page.h b/chrome/browser/ssl/ssl_blocking_page.h
|
| index 342b0926bfbf5e28fc93d79f2fd87c64bcc322ce..1a6db9b20d6258f44dd56edae0c73b78f5153a6b 100644
|
| --- a/chrome/browser/ssl/ssl_blocking_page.h
|
| +++ b/chrome/browser/ssl/ssl_blocking_page.h
|
| @@ -35,12 +35,7 @@ class ExperienceSamplingEvent;
|
| // This class is responsible for showing/hiding the interstitial page that is
|
| // shown when a certificate error happens.
|
| // It deletes itself when the interstitial page is closed.
|
| -//
|
| -// This class should only be used on the UI thread because its implementation
|
| -// uses captive_portal::CaptivePortalService which can only be accessed on the
|
| -// UI thread.
|
| -class SSLBlockingPage : public content::InterstitialPageDelegate,
|
| - public content::NotificationObserver {
|
| +class SSLBlockingPage : public content::InterstitialPageDelegate {
|
| public:
|
| // These represent the commands sent from the interstitial JavaScript. They
|
| // are defined in chrome/browser/resources/ssl/ssl_errors_common.js.
|
| @@ -95,12 +90,6 @@ class SSLBlockingPage : public content::InterstitialPageDelegate,
|
| // Used to query the HistoryService to see if the URL is in history. For UMA.
|
| void OnGotHistoryCount(bool success, int num_visits, base::Time first_visit);
|
|
|
| - // content::NotificationObserver:
|
| - virtual void Observe(
|
| - int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) OVERRIDE;
|
| -
|
| base::Callback<void(bool)> callback_;
|
|
|
| content::WebContents* web_contents_;
|
| @@ -119,14 +108,6 @@ class SSLBlockingPage : public content::InterstitialPageDelegate,
|
| int num_visits_;
|
| // Used for getting num_visits_.
|
| base::CancelableTaskTracker request_tracker_;
|
| - // Is captive portal detection enabled?
|
| - bool captive_portal_detection_enabled_;
|
| - // Did the probe complete before the interstitial was closed?
|
| - bool captive_portal_probe_completed_;
|
| - // Did the captive portal probe receive an error or get a non-HTTP response?
|
| - bool captive_portal_no_response_;
|
| - // Was a captive portal detected?
|
| - bool captive_portal_detected_;
|
|
|
| // For the FieldTrial: this contains the name of the condition.
|
| std::string trial_condition_;
|
|
|