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

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: Rebase and update tests. Created 4 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
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 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR; 537 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
538 } else if (security_info.security_bits == 0) { 538 } else if (security_info.security_bits == 0) {
539 DCHECK_NE(security_info.security_level, SecurityStateModel::NONE); 539 DCHECK_NE(security_info.security_level, SecurityStateModel::NONE);
540 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR; 540 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
541 site_connection_details_.assign(l10n_util::GetStringFUTF16( 541 site_connection_details_.assign(l10n_util::GetStringFUTF16(
542 IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT, 542 IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT,
543 subject_name)); 543 subject_name));
544 } else { 544 } else {
545 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED; 545 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED;
546 546
547 if (security_info.is_secure_protocol_and_ciphersuite) { 547 if (security_info.obsolete_ssl_status == net::OBSOLETE_SSL_NONE) {
548 site_connection_details_.assign(l10n_util::GetStringFUTF16( 548 site_connection_details_.assign(l10n_util::GetStringFUTF16(
549 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT, 549 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT,
550 subject_name)); 550 subject_name));
551 } else { 551 } else {
552 site_connection_details_.assign(l10n_util::GetStringFUTF16( 552 site_connection_details_.assign(l10n_util::GetStringFUTF16(
553 IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT, 553 IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT,
554 subject_name)); 554 subject_name));
555 } 555 }
556 556
557 if (security_info.mixed_content_status != 557 if (security_info.mixed_content_status !=
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 info.connection_status = site_connection_status_; 754 info.connection_status = site_connection_status_;
755 info.connection_status_description = 755 info.connection_status_description =
756 UTF16ToUTF8(site_connection_details_); 756 UTF16ToUTF8(site_connection_details_);
757 info.identity_status = site_identity_status_; 757 info.identity_status = site_identity_status_;
758 info.identity_status_description = 758 info.identity_status_description =
759 UTF16ToUTF8(site_identity_details_); 759 UTF16ToUTF8(site_identity_details_);
760 info.cert_id = cert_id_; 760 info.cert_id = cert_id_;
761 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 761 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
762 ui_->SetIdentityInfo(info); 762 ui_->SetIdentityInfo(info);
763 } 763 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698