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

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

Issue 1843063002: Don't show scheme in permission prompts if it is HTTPS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
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 #include "chrome/browser/ui/website_settings/website_settings.h" 5 #include "chrome/browser/ui/website_settings/website_settings.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 if (sct_verify_statuses.empty() || 180 if (sct_verify_statuses.empty() ||
181 CertificateTransparencyStatusMatchAny(sct_verify_statuses, 181 CertificateTransparencyStatusMatchAny(sct_verify_statuses,
182 net::ct::SCT_STATUS_OK)) 182 net::ct::SCT_STATUS_OK))
183 return is_ev ? WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT 183 return is_ev ? WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT
184 : WebsiteSettings::SITE_IDENTITY_STATUS_CERT; 184 : WebsiteSettings::SITE_IDENTITY_STATUS_CERT;
185 185
186 return WebsiteSettings::SITE_IDENTITY_STATUS_CT_ERROR; 186 return WebsiteSettings::SITE_IDENTITY_STATUS_CT_ERROR;
187 } 187 }
188 188
189 base::string16 GetSimpleSiteName(const GURL& url) { 189 base::string16 GetSimpleSiteName(const GURL& url) {
190 return url_formatter::FormatUrlForSecurityDisplayOmitScheme(url); 190 return url_formatter::FormatUrlForSecurityDisplay(
191 url, url_formatter::SchemeDisplay::OMIT_HTTP_AND_HTTPS);
191 } 192 }
192 193
193 ChooserContextBase* GetUsbChooserContext(Profile* profile) { 194 ChooserContextBase* GetUsbChooserContext(Profile* profile) {
194 return UsbChooserContextFactory::GetForProfile(profile); 195 return UsbChooserContextFactory::GetForProfile(profile);
195 } 196 }
196 197
197 // The list of chooser types that need to display entries in the Website 198 // The list of chooser types that need to display entries in the Website
198 // Settings UI. THE ORDER OF THESE ITEMS IS IMPORTANT. To propose changing it, 199 // Settings UI. THE ORDER OF THESE ITEMS IS IMPORTANT. To propose changing it,
199 // email security-dev@chromium.org. 200 // email security-dev@chromium.org.
200 WebsiteSettings::ChooserUIInfo kChooserUIInfo[] = { 201 WebsiteSettings::ChooserUIInfo kChooserUIInfo[] = {
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 info.connection_status = site_connection_status_; 761 info.connection_status = site_connection_status_;
761 info.connection_status_description = 762 info.connection_status_description =
762 UTF16ToUTF8(site_connection_details_); 763 UTF16ToUTF8(site_connection_details_);
763 info.identity_status = site_identity_status_; 764 info.identity_status = site_identity_status_;
764 info.identity_status_description = 765 info.identity_status_description =
765 UTF16ToUTF8(site_identity_details_); 766 UTF16ToUTF8(site_identity_details_);
766 info.cert_id = cert_id_; 767 info.cert_id = cert_id_;
767 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 768 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
768 ui_->SetIdentityInfo(info); 769 ui_->SetIdentityInfo(info);
769 } 770 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/website_settings/permissions_bubble_view.cc ('k') | components/app_modal/javascript_dialog_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698