| OLD | NEW |
| 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 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 != |
| 558 SecurityStateModel::NO_MIXED_CONTENT) { | 558 SecurityStateModel::CONTENT_STATUS_NONE) { |
| 559 bool ran_insecure_content = | 559 bool ran_insecure_content = |
| 560 (security_info.mixed_content_status == | 560 (security_info.mixed_content_status == |
| 561 SecurityStateModel::RAN_MIXED_CONTENT || | 561 SecurityStateModel::CONTENT_STATUS_RAN || |
| 562 security_info.mixed_content_status == | 562 security_info.mixed_content_status == |
| 563 SecurityStateModel::RAN_AND_DISPLAYED_MIXED_CONTENT); | 563 SecurityStateModel::CONTENT_STATUS_DISPLAYED_AND_RAN); |
| 564 site_connection_status_ = ran_insecure_content | 564 site_connection_status_ = ran_insecure_content |
| 565 ? SITE_CONNECTION_STATUS_MIXED_SCRIPT | 565 ? SITE_CONNECTION_STATUS_MIXED_SCRIPT |
| 566 : SITE_CONNECTION_STATUS_MIXED_CONTENT; | 566 : SITE_CONNECTION_STATUS_MIXED_CONTENT; |
| 567 site_connection_details_.assign(l10n_util::GetStringFUTF16( | 567 site_connection_details_.assign(l10n_util::GetStringFUTF16( |
| 568 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK, | 568 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK, |
| 569 site_connection_details_, | 569 site_connection_details_, |
| 570 l10n_util::GetStringUTF16(ran_insecure_content ? | 570 l10n_util::GetStringUTF16(ran_insecure_content ? |
| 571 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_ERROR : | 571 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_ERROR : |
| 572 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_WARNING))); | 572 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_WARNING))); |
| 573 } | 573 } |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 } |
| OLD | NEW |