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_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_ | 5 #ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_ |
6 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_ | 6 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
88 // The ID is the server certificate of a secure connection or 0. | 88 // The ID is the server certificate of a secure connection or 0. |
89 int cert_id; | 89 int cert_id; |
90 // Signed Certificate Timestamp ids and status | 90 // Signed Certificate Timestamp ids and status |
91 content::SignedCertificateTimestampIDStatusList | 91 content::SignedCertificateTimestampIDStatusList |
92 signed_certificate_timestamp_ids; | 92 signed_certificate_timestamp_ids; |
93 // Status of the site's connection. | 93 // Status of the site's connection. |
94 WebsiteSettings::SiteConnectionStatus connection_status; | 94 WebsiteSettings::SiteConnectionStatus connection_status; |
95 // Textual description of the site's connection status that is displayed to | 95 // Textual description of the site's connection status that is displayed to |
96 // the user. | 96 // the user. |
97 std::string connection_status_description; | 97 std::string connection_status_description; |
98 // Set when the user has explicitly bypassed an SSL error for this host. | |
99 // When |certificate_decision_made| is true, the connection area of the | |
100 // page info will include an option for the user to revoke their decision to | |
101 // bypass the SSL error for this host. | |
Peter Kasting
2014/08/07 03:56:58
This comment is much better now! Maybe the variab
jww
2014/08/08 16:48:50
have_bypassed_ssl_error sounds great to me.
Peter Kasting
2014/08/08 17:15:12
If denying isn't possible in the Chrome UI, I thin
jww
2014/08/11 19:21:28
There might be a reason to blacklist specific cert
Peter Kasting
2014/08/11 20:24:20
This is dangerous reasoning. If this doesn't come
| |
102 bool certificate_decision_made; | |
98 }; | 103 }; |
99 | 104 |
100 typedef std::vector<CookieInfo> CookieInfoList; | 105 typedef std::vector<CookieInfo> CookieInfoList; |
101 typedef std::vector<PermissionInfo> PermissionInfoList; | 106 typedef std::vector<PermissionInfo> PermissionInfoList; |
102 | 107 |
103 virtual ~WebsiteSettingsUI(); | 108 virtual ~WebsiteSettingsUI(); |
104 | 109 |
105 // Returns the UI string for the given permission |type|. | 110 // Returns the UI string for the given permission |type|. |
106 static base::string16 PermissionTypeToUIString(ContentSettingsType type); | 111 static base::string16 PermissionTypeToUIString(ContentSettingsType type); |
107 | 112 |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
162 virtual void SetFirstVisit(const base::string16& first_visit) = 0; | 167 virtual void SetFirstVisit(const base::string16& first_visit) = 0; |
163 | 168 |
164 // Selects the tab with the given |tab_id|. | 169 // Selects the tab with the given |tab_id|. |
165 virtual void SetSelectedTab(TabId tab_id) = 0; | 170 virtual void SetSelectedTab(TabId tab_id) = 0; |
166 }; | 171 }; |
167 | 172 |
168 typedef WebsiteSettingsUI::CookieInfoList CookieInfoList; | 173 typedef WebsiteSettingsUI::CookieInfoList CookieInfoList; |
169 typedef WebsiteSettingsUI::PermissionInfoList PermissionInfoList; | 174 typedef WebsiteSettingsUI::PermissionInfoList PermissionInfoList; |
170 | 175 |
171 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_ | 176 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_UI_H_ |
OLD | NEW |