Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Side by Side Diff: chrome/browser/ssl/ssl_blocking_page.h

Issue 448163002: Simplify overridable logic in SSLBlockingPage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ssl/ssl_blocking_page.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 const content::NotificationSource& source, 95 const content::NotificationSource& source,
96 const content::NotificationDetails& details) OVERRIDE; 96 const content::NotificationDetails& details) OVERRIDE;
97 97
98 base::Callback<void(bool)> callback_; 98 base::Callback<void(bool)> callback_;
99 99
100 content::WebContents* web_contents_; 100 content::WebContents* web_contents_;
101 int cert_error_; 101 int cert_error_;
102 const net::SSLInfo ssl_info_; 102 const net::SSLInfo ssl_info_;
103 GURL request_url_; 103 GURL request_url_;
104 // Could the user successfully override the error? 104 // Could the user successfully override the error?
105 // overridable_ will be set to false if strict_enforcement_ is true.
105 bool overridable_; 106 bool overridable_;
106 // Has the site requested strict enforcement of certificate errors? 107 // Has the site requested strict enforcement of certificate errors?
107 bool strict_enforcement_; 108 bool strict_enforcement_;
108 content::InterstitialPage* interstitial_page_; // Owns us. 109 content::InterstitialPage* interstitial_page_; // Owns us.
109 // Is the hostname for an internal network? 110 // Is the hostname for an internal network?
110 bool internal_; 111 bool internal_;
111 // How many times is this same URL in history? 112 // How many times is this same URL in history?
112 int num_visits_; 113 int num_visits_;
113 // Used for getting num_visits_. 114 // Used for getting num_visits_.
114 base::CancelableTaskTracker request_tracker_; 115 base::CancelableTaskTracker request_tracker_;
115 // Is captive portal detection enabled? 116 // Is captive portal detection enabled?
116 bool captive_portal_detection_enabled_; 117 bool captive_portal_detection_enabled_;
117 // Did the probe complete before the interstitial was closed? 118 // Did the probe complete before the interstitial was closed?
118 bool captive_portal_probe_completed_; 119 bool captive_portal_probe_completed_;
119 // Did the captive portal probe receive an error or get a non-HTTP response? 120 // Did the captive portal probe receive an error or get a non-HTTP response?
120 bool captive_portal_no_response_; 121 bool captive_portal_no_response_;
121 // Was a captive portal detected? 122 // Was a captive portal detected?
122 bool captive_portal_detected_; 123 bool captive_portal_detected_;
123 124
124 content::NotificationRegistrar registrar_; 125 content::NotificationRegistrar registrar_;
125 126
126 DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage); 127 DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage);
127 }; 128 };
128 129
129 #endif // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ 130 #endif // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ssl/ssl_blocking_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698