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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings.h

Issue 418133012: Add button to page info to revoke user certificate decisions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address pkasting comments 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
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_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_ 5 #ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_
6 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_ 6 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/task/cancelable_task_tracker.h" 10 #include "base/task/cancelable_task_tracker.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 base::Time first_visit); 90 base::Time first_visit);
91 91
92 // This method is called by the UI when the UI is closing. 92 // This method is called by the UI when the UI is closing.
93 void OnUIClosing(); 93 void OnUIClosing();
94 94
95 // Accessors. 95 // Accessors.
96 SiteConnectionStatus site_connection_status() const { 96 SiteConnectionStatus site_connection_status() const {
97 return site_connection_status_; 97 return site_connection_status_;
98 } 98 }
99 99
100 const GURL& site_url() const { return site_url_; }
101
100 SiteIdentityStatus site_identity_status() const { 102 SiteIdentityStatus site_identity_status() const {
101 return site_identity_status_; 103 return site_identity_status_;
102 } 104 }
103 105
104 base::string16 site_connection_details() const { 106 base::string16 site_connection_details() const {
105 return site_connection_details_; 107 return site_connection_details_;
106 } 108 }
107 109
108 base::string16 site_identity_details() const { 110 base::string16 site_identity_details() const {
109 return site_identity_details_; 111 return site_identity_details_;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 173
172 // TODO(markusheintz): Move the creation of all the base::string16 typed UI 174 // TODO(markusheintz): Move the creation of all the base::string16 typed UI
173 // strings below to the corresponding UI code, in order to prevent 175 // strings below to the corresponding UI code, in order to prevent
174 // unnecessary UTF-8 string conversions. 176 // unnecessary UTF-8 string conversions.
175 177
176 // Details about the website's identity. If the website's identity has been 178 // Details about the website's identity. If the website's identity has been
177 // verified then |site_identity_details_| contains who verified the identity. 179 // verified then |site_identity_details_| contains who verified the identity.
178 // This string will be displayed in the UI. 180 // This string will be displayed in the UI.
179 base::string16 site_identity_details_; 181 base::string16 site_identity_details_;
180 182
183 // Set when the user has explicitly bypassed an SSL error for this host.
184 // When |certificate_decision_made| is true, the connection area of the
185 // page info will include an option for the user to revoke their decision to
186 // bypass the SSL error for this host.
Peter Kasting 2014/08/07 03:56:58 (See comment in website_settings_ui.h )
jww 2014/08/08 16:48:50 Acknowledged.
187 bool certificate_decision_made_;
188
181 // Details about the connection to the website. In case of an encrypted 189 // Details about the connection to the website. In case of an encrypted
182 // connection |site_connection_details_| contains encryption details, like 190 // connection |site_connection_details_| contains encryption details, like
183 // encryption strength and ssl protocol version. This string will be 191 // encryption strength and ssl protocol version. This string will be
184 // displayed in the UI. 192 // displayed in the UI.
185 base::string16 site_connection_details_; 193 base::string16 site_connection_details_;
186 194
187 // For websites that provided an EV certificate |orgainization_name_| 195 // For websites that provided an EV certificate |orgainization_name_|
188 // contains the organization name of the certificate. In all other cases 196 // contains the organization name of the certificate. In all other cases
189 // |organization_name| is an empty string. This string will be displayed in 197 // |organization_name| is an empty string. This string will be displayed in
190 // the UI. 198 // the UI.
191 base::string16 organization_name_; 199 base::string16 organization_name_;
192 200
193 // The |CertStore| provides all X509Certificates. 201 // The |CertStore| provides all X509Certificates.
194 content::CertStore* cert_store_; 202 content::CertStore* cert_store_;
195 203
196 // The |HostContentSettingsMap| is the service that provides and manages 204 // The |HostContentSettingsMap| is the service that provides and manages
197 // content settings (aka. site permissions). 205 // content settings (aka. site permissions).
198 HostContentSettingsMap* content_settings_; 206 HostContentSettingsMap* content_settings_;
199 207
200 // Used to request the number of page visits. 208 // Used to request the number of page visits.
201 base::CancelableTaskTracker visit_count_task_tracker_; 209 base::CancelableTaskTracker visit_count_task_tracker_;
202 210
203 DISALLOW_COPY_AND_ASSIGN(WebsiteSettings); 211 DISALLOW_COPY_AND_ASSIGN(WebsiteSettings);
204 }; 212 };
205 213
206 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_ 214 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698