| Index: chrome/browser/captive_portal/captive_portal_tab_reloader.h
|
| diff --git a/chrome/browser/captive_portal/captive_portal_tab_reloader.h b/chrome/browser/captive_portal/captive_portal_tab_reloader.h
|
| index 83a76865e1415ad1e569285ed197f8796622c2f4..db6b1228d6e54b2383a8094ea816b69d89e3ff23 100644
|
| --- a/chrome/browser/captive_portal/captive_portal_tab_reloader.h
|
| +++ b/chrome/browser/captive_portal/captive_portal_tab_reloader.h
|
| @@ -23,8 +23,6 @@ namespace net {
|
| class SSLInfo;
|
| }
|
|
|
| -namespace captive_portal {
|
| -
|
| // Keeps track of whether a tab has encountered a navigation error caused by a
|
| // captive portal. Also triggers captive portal checks when a page load may
|
| // have been broken or be taking longer due to a captive portal. All methods
|
| @@ -106,7 +104,9 @@ class CaptivePortalTabReloader {
|
| virtual void OnRedirect(bool is_ssl);
|
|
|
| // Called whenever a captive portal test completes.
|
| - virtual void OnCaptivePortalResults(Result previous_result, Result result);
|
| + virtual void OnCaptivePortalResults(
|
| + captive_portal::CaptivePortalResult previous_result,
|
| + captive_portal::CaptivePortalResult result);
|
|
|
| // Called on certificate errors, which often indicate a captive portal.
|
| void OnSSLCertError(const net::SSLInfo& ssl_info);
|
| @@ -183,6 +183,4 @@ class CaptivePortalTabReloader {
|
| DISALLOW_COPY_AND_ASSIGN(CaptivePortalTabReloader);
|
| };
|
|
|
| -} // namespace captive_portal
|
| -
|
| #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_RELOADER_H_
|
|
|