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

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

Issue 1727133002: Expose TLS settings in the Security panel overview, and call out individual obsolete settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to comments; simplify a lot of the strings; take out IsObsoleteTLSCipherSuite(). 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 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR; 540 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
541 } else if (security_info.security_bits == 0) { 541 } else if (security_info.security_bits == 0) {
542 DCHECK_NE(security_info.security_level, SecurityStateModel::NONE); 542 DCHECK_NE(security_info.security_level, SecurityStateModel::NONE);
543 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR; 543 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
544 site_connection_details_.assign(l10n_util::GetStringFUTF16( 544 site_connection_details_.assign(l10n_util::GetStringFUTF16(
545 IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT, 545 IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT,
546 subject_name)); 546 subject_name));
547 } else { 547 } else {
548 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED; 548 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED;
549 549
550 if (security_info.is_secure_protocol_and_ciphersuite) { 550 if (security_info.obsolete_ssl_status == net::OBSOLETE_SSL_NONE) {
551 site_connection_details_.assign(l10n_util::GetStringFUTF16( 551 site_connection_details_.assign(l10n_util::GetStringFUTF16(
552 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT, 552 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT,
553 subject_name)); 553 subject_name));
554 } else { 554 } else {
555 site_connection_details_.assign(l10n_util::GetStringFUTF16( 555 site_connection_details_.assign(l10n_util::GetStringFUTF16(
556 IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT, 556 IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT,
557 subject_name)); 557 subject_name));
558 } 558 }
559 559
560 if (security_info.mixed_content_status != 560 if (security_info.mixed_content_status !=
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 info.connection_status = site_connection_status_; 761 info.connection_status = site_connection_status_;
762 info.connection_status_description = 762 info.connection_status_description =
763 UTF16ToUTF8(site_connection_details_); 763 UTF16ToUTF8(site_connection_details_);
764 info.identity_status = site_identity_status_; 764 info.identity_status = site_identity_status_;
765 info.identity_status_description = 765 info.identity_status_description =
766 UTF16ToUTF8(site_identity_details_); 766 UTF16ToUTF8(site_identity_details_);
767 info.cert_id = cert_id_; 767 info.cert_id = cert_id_;
768 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 768 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
769 ui_->SetIdentityInfo(info); 769 ui_->SetIdentityInfo(info);
770 } 770 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698