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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 #include "content/public/browser/permission_type.h" | 58 #include "content/public/browser/permission_type.h" |
59 #include "content/public/browser/user_metrics.h" | 59 #include "content/public/browser/user_metrics.h" |
60 #include "content/public/common/content_switches.h" | 60 #include "content/public/common/content_switches.h" |
61 #include "content/public/common/url_constants.h" | 61 #include "content/public/common/url_constants.h" |
62 #include "grit/components_chromium_strings.h" | 62 #include "grit/components_chromium_strings.h" |
63 #include "grit/components_google_chrome_strings.h" | 63 #include "grit/components_google_chrome_strings.h" |
64 #include "grit/components_strings.h" | 64 #include "grit/components_strings.h" |
65 #include "net/cert/cert_status_flags.h" | 65 #include "net/cert/cert_status_flags.h" |
66 #include "net/cert/x509_certificate.h" | 66 #include "net/cert/x509_certificate.h" |
67 #include "net/ssl/ssl_cipher_suite_names.h" | 67 #include "net/ssl/ssl_cipher_suite_names.h" |
| 68 #include "net/ssl/ssl_cipher_suite_names.h" |
68 #include "net/ssl/ssl_connection_status_flags.h" | 69 #include "net/ssl/ssl_connection_status_flags.h" |
69 #include "ui/base/l10n/l10n_util.h" | 70 #include "ui/base/l10n/l10n_util.h" |
70 | 71 |
71 #if defined(OS_CHROMEOS) | 72 #if defined(OS_CHROMEOS) |
72 #include "chrome/browser/chromeos/policy/policy_cert_service.h" | 73 #include "chrome/browser/chromeos/policy/policy_cert_service.h" |
73 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" | 74 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" |
74 #endif | 75 #endif |
75 | 76 |
76 #if !defined(OS_ANDROID) | 77 #if !defined(OS_ANDROID) |
77 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" | 78 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" |
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
538 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR; | 539 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR; |
539 } else if (security_info.security_bits == 0) { | 540 } else if (security_info.security_bits == 0) { |
540 DCHECK_NE(security_info.security_level, SecurityStateModel::NONE); | 541 DCHECK_NE(security_info.security_level, SecurityStateModel::NONE); |
541 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR; | 542 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR; |
542 site_connection_details_.assign(l10n_util::GetStringFUTF16( | 543 site_connection_details_.assign(l10n_util::GetStringFUTF16( |
543 IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT, | 544 IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT, |
544 subject_name)); | 545 subject_name)); |
545 } else { | 546 } else { |
546 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED; | 547 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED; |
547 | 548 |
548 if (security_info.is_secure_protocol_and_ciphersuite) { | 549 if (security_info.obsolete_ssl_status == net::OBSOLETE_SSL_NONE) { |
549 site_connection_details_.assign(l10n_util::GetStringFUTF16( | 550 site_connection_details_.assign(l10n_util::GetStringFUTF16( |
550 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT, | 551 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT, |
551 subject_name)); | 552 subject_name)); |
552 } else { | 553 } else { |
553 site_connection_details_.assign(l10n_util::GetStringFUTF16( | 554 site_connection_details_.assign(l10n_util::GetStringFUTF16( |
554 IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT, | 555 IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT, |
555 subject_name)); | 556 subject_name)); |
556 } | 557 } |
557 | 558 |
558 if (security_info.mixed_content_status != | 559 if (security_info.mixed_content_status != |
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
759 info.connection_status = site_connection_status_; | 760 info.connection_status = site_connection_status_; |
760 info.connection_status_description = | 761 info.connection_status_description = |
761 UTF16ToUTF8(site_connection_details_); | 762 UTF16ToUTF8(site_connection_details_); |
762 info.identity_status = site_identity_status_; | 763 info.identity_status = site_identity_status_; |
763 info.identity_status_description = | 764 info.identity_status_description = |
764 UTF16ToUTF8(site_identity_details_); | 765 UTF16ToUTF8(site_identity_details_); |
765 info.cert_id = cert_id_; | 766 info.cert_id = cert_id_; |
766 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; | 767 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; |
767 ui_->SetIdentityInfo(info); | 768 ui_->SetIdentityInfo(info); |
768 } | 769 } |
OLD | NEW |