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

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: Also check that connection_status is not zero, which is the case for 3 browser tests. Created 4 years, 3 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 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR; 582 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
583 } else if (security_info.security_bits == 0) { 583 } else if (security_info.security_bits == 0) {
584 DCHECK_NE(security_info.security_level, SecurityStateModel::NONE); 584 DCHECK_NE(security_info.security_level, SecurityStateModel::NONE);
585 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR; 585 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
586 site_connection_details_.assign(l10n_util::GetStringFUTF16( 586 site_connection_details_.assign(l10n_util::GetStringFUTF16(
587 IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT, 587 IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT,
588 subject_name)); 588 subject_name));
589 } else { 589 } else {
590 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED; 590 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED;
591 591
592 if (security_info.is_secure_protocol_and_ciphersuite) { 592 if (security_info.obsolete_ssl_status == net::OBSOLETE_SSL_NONE) {
593 site_connection_details_.assign(l10n_util::GetStringFUTF16( 593 site_connection_details_.assign(l10n_util::GetStringFUTF16(
594 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT, 594 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT,
595 subject_name)); 595 subject_name));
596 } else { 596 } else {
597 site_connection_details_.assign(l10n_util::GetStringFUTF16( 597 site_connection_details_.assign(l10n_util::GetStringFUTF16(
598 IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT, 598 IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT,
599 subject_name)); 599 subject_name));
600 } 600 }
601 601
602 bool ran_insecure_content = false; 602 bool ran_insecure_content = false;
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 info.connection_status = site_connection_status_; 802 info.connection_status = site_connection_status_;
803 info.connection_status_description = 803 info.connection_status_description =
804 UTF16ToUTF8(site_connection_details_); 804 UTF16ToUTF8(site_connection_details_);
805 info.identity_status = site_identity_status_; 805 info.identity_status = site_identity_status_;
806 info.identity_status_description = 806 info.identity_status_description =
807 UTF16ToUTF8(site_identity_details_); 807 UTF16ToUTF8(site_identity_details_);
808 info.cert_id = cert_id_; 808 info.cert_id = cert_id_;
809 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 809 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
810 ui_->SetIdentityInfo(info); 810 ui_->SetIdentityInfo(info);
811 } 811 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698