| 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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 security_state::MaliciousContentStatus malicious_content_status, | 165 security_state::MaliciousContentStatus malicious_content_status, |
| 166 WebsiteSettings::SiteIdentityStatus* status, | 166 WebsiteSettings::SiteIdentityStatus* status, |
| 167 base::string16* details) { | 167 base::string16* details) { |
| 168 switch (malicious_content_status) { | 168 switch (malicious_content_status) { |
| 169 case security_state::MALICIOUS_CONTENT_STATUS_NONE: | 169 case security_state::MALICIOUS_CONTENT_STATUS_NONE: |
| 170 NOTREACHED(); | 170 NOTREACHED(); |
| 171 break; | 171 break; |
| 172 case security_state::MALICIOUS_CONTENT_STATUS_MALWARE: | 172 case security_state::MALICIOUS_CONTENT_STATUS_MALWARE: |
| 173 *status = WebsiteSettings::SITE_IDENTITY_STATUS_MALWARE; | 173 *status = WebsiteSettings::SITE_IDENTITY_STATUS_MALWARE; |
| 174 *details = | 174 *details = |
| 175 l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_MALWARE_DETAILS); | 175 l10n_util::GetStringUTF16(IDS_PAGEINFO_MALWARE_DETAILS); |
| 176 break; | 176 break; |
| 177 case security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING: | 177 case security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING: |
| 178 *status = WebsiteSettings::SITE_IDENTITY_STATUS_SOCIAL_ENGINEERING; | 178 *status = WebsiteSettings::SITE_IDENTITY_STATUS_SOCIAL_ENGINEERING; |
| 179 *details = l10n_util::GetStringUTF16( | 179 *details = l10n_util::GetStringUTF16( |
| 180 IDS_WEBSITE_SETTINGS_SOCIAL_ENGINEERING_DETAILS); | 180 IDS_PAGEINFO_SOCIAL_ENGINEERING_DETAILS); |
| 181 break; | 181 break; |
| 182 case security_state::MALICIOUS_CONTENT_STATUS_UNWANTED_SOFTWARE: | 182 case security_state::MALICIOUS_CONTENT_STATUS_UNWANTED_SOFTWARE: |
| 183 *status = WebsiteSettings::SITE_IDENTITY_STATUS_UNWANTED_SOFTWARE; | 183 *status = WebsiteSettings::SITE_IDENTITY_STATUS_UNWANTED_SOFTWARE; |
| 184 *details = l10n_util::GetStringUTF16( | 184 *details = l10n_util::GetStringUTF16( |
| 185 IDS_WEBSITE_SETTINGS_UNWANTED_SOFTWARE_DETAILS); | 185 IDS_PAGEINFO_UNWANTED_SOFTWARE_DETAILS); |
| 186 break; | 186 break; |
| 187 } | 187 } |
| 188 } | 188 } |
| 189 | 189 |
| 190 base::string16 GetSimpleSiteName(const GURL& url) { | 190 base::string16 GetSimpleSiteName(const GURL& url) { |
| 191 return url_formatter::FormatUrlForSecurityDisplay( | 191 return url_formatter::FormatUrlForSecurityDisplay( |
| 192 url, url_formatter::SchemeDisplay::OMIT_HTTP_AND_HTTPS); | 192 url, url_formatter::SchemeDisplay::OMIT_HTTP_AND_HTTPS); |
| 193 } | 193 } |
| 194 | 194 |
| 195 ChooserContextBase* GetUsbChooserContext(Profile* profile) { | 195 ChooserContextBase* GetUsbChooserContext(Profile* profile) { |
| (...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 739 info.connection_status = site_connection_status_; | 739 info.connection_status = site_connection_status_; |
| 740 info.connection_status_description = | 740 info.connection_status_description = |
| 741 UTF16ToUTF8(site_connection_details_); | 741 UTF16ToUTF8(site_connection_details_); |
| 742 info.identity_status = site_identity_status_; | 742 info.identity_status = site_identity_status_; |
| 743 info.identity_status_description = | 743 info.identity_status_description = |
| 744 UTF16ToUTF8(site_identity_details_); | 744 UTF16ToUTF8(site_identity_details_); |
| 745 info.certificate = certificate_; | 745 info.certificate = certificate_; |
| 746 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; | 746 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; |
| 747 ui_->SetIdentityInfo(info); | 747 ui_->SetIdentityInfo(info); |
| 748 } | 748 } |
| OLD | NEW |