| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ | 5 #ifndef CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ |
| 6 #define CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ | 6 #define CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 virtual void OverrideEntry(content::NavigationEntry* entry) OVERRIDE; | 72 virtual void OverrideEntry(content::NavigationEntry* entry) OVERRIDE; |
| 73 virtual void OverrideRendererPrefs( | 73 virtual void OverrideRendererPrefs( |
| 74 content::RendererPreferences* prefs) OVERRIDE; | 74 content::RendererPreferences* prefs) OVERRIDE; |
| 75 virtual void OnProceed() OVERRIDE; | 75 virtual void OnProceed() OVERRIDE; |
| 76 virtual void OnDontProceed() OVERRIDE; | 76 virtual void OnDontProceed() OVERRIDE; |
| 77 | 77 |
| 78 private: | 78 private: |
| 79 void NotifyDenyCertificate(); | 79 void NotifyDenyCertificate(); |
| 80 void NotifyAllowCertificate(); | 80 void NotifyAllowCertificate(); |
| 81 | 81 |
| 82 // These fetch the appropriate HTML page, depending on the | |
| 83 // SSLInterstitialVersion Finch trial. | |
| 84 std::string GetHTMLContentsV1(); | |
| 85 std::string GetHTMLContentsV2(); | |
| 86 | |
| 87 // Used to query the HistoryService to see if the URL is in history. For UMA. | 82 // Used to query the HistoryService to see if the URL is in history. For UMA. |
| 88 void OnGotHistoryCount(bool success, int num_visits, base::Time first_visit); | 83 void OnGotHistoryCount(bool success, int num_visits, base::Time first_visit); |
| 89 | 84 |
| 90 // content::NotificationObserver: | 85 // content::NotificationObserver: |
| 91 virtual void Observe( | 86 virtual void Observe( |
| 92 int type, | 87 int type, |
| 93 const content::NotificationSource& source, | 88 const content::NotificationSource& source, |
| 94 const content::NotificationDetails& details) OVERRIDE; | 89 const content::NotificationDetails& details) OVERRIDE; |
| 95 | 90 |
| 96 base::Callback<void(bool)> callback_; | 91 base::Callback<void(bool)> callback_; |
| (...skipping 15 matching lines...) Expand all Loading... |
| 112 base::CancelableTaskTracker request_tracker_; | 107 base::CancelableTaskTracker request_tracker_; |
| 113 // Is captive portal detection enabled? | 108 // Is captive portal detection enabled? |
| 114 bool captive_portal_detection_enabled_; | 109 bool captive_portal_detection_enabled_; |
| 115 // Did the probe complete before the interstitial was closed? | 110 // Did the probe complete before the interstitial was closed? |
| 116 bool captive_portal_probe_completed_; | 111 bool captive_portal_probe_completed_; |
| 117 // Did the captive portal probe receive an error or get a non-HTTP response? | 112 // Did the captive portal probe receive an error or get a non-HTTP response? |
| 118 bool captive_portal_no_response_; | 113 bool captive_portal_no_response_; |
| 119 // Was a captive portal detected? | 114 // Was a captive portal detected? |
| 120 bool captive_portal_detected_; | 115 bool captive_portal_detected_; |
| 121 | 116 |
| 122 // For the FieldTrial: this contains the name of the condition. | |
| 123 std::string trial_condition_; | |
| 124 | |
| 125 content::NotificationRegistrar registrar_; | 117 content::NotificationRegistrar registrar_; |
| 126 | 118 |
| 127 DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage); | 119 DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage); |
| 128 }; | 120 }; |
| 129 | 121 |
| 130 #endif // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ | 122 #endif // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ |
| OLD | NEW |