diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 18:28:48 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 18:28:48 +0000 |
| commit | b4e75c12dacc0922694b12b687a48dd2d973b595 (patch) | |
| tree | 23d65e13ccf2fd9535ffb7ad965c5f2826efd6cc /chrome/browser/page_info_model.cc | |
| parent | 15ad5dcb44ab2049103f738625e4e5f2483d85da (diff) | |
| download | chromium_src-b4e75c12dacc0922694b12b687a48dd2d973b595.zip chromium_src-b4e75c12dacc0922694b12b687a48dd2d973b595.tar.gz chromium_src-b4e75c12dacc0922694b12b687a48dd2d973b595.tar.bz2 | |
Rename "mixed content" to "insecure content" in as many places as possible, to standardize on a consistent naming scheme.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2069005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/page_info_model.cc')
| -rw-r--r-- | chrome/browser/page_info_model.cc | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc index 381008c..1a29e42 100644 --- a/chrome/browser/page_info_model.cc +++ b/chrome/browser/page_info_model.cc @@ -122,31 +122,27 @@ PageInfoModel::PageInfoModel(Profile* profile, description.clear(); if (ssl.security_bits() <= 0) { state = false; - description.assign( - l10n_util::GetStringFUTF16( - IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT, - subject_name)); + description.assign(l10n_util::GetStringFUTF16( + IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT, + subject_name)); } else if (ssl.security_bits() < 80) { state = false; - description.assign( - l10n_util::GetStringFUTF16( - IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT, - subject_name)); + description.assign(l10n_util::GetStringFUTF16( + IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT, + subject_name)); } else { - description.assign( - l10n_util::GetStringFUTF16( - IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT, - subject_name, - IntToString16(ssl.security_bits()))); - if (ssl.displayed_mixed_content() || ssl.ran_mixed_content()) { + description.assign(l10n_util::GetStringFUTF16( + IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT, + subject_name, + IntToString16(ssl.security_bits()))); + if (ssl.displayed_insecure_content() || ssl.ran_insecure_content()) { state = false; - description.assign( - l10n_util::GetStringFUTF16( - IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK, - description, - l10n_util::GetStringUTF16(ssl.ran_mixed_content() ? - IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_MIXED_CONTENT_ERROR : - IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_MIXED_CONTENT_WARNING))); + description.assign(l10n_util::GetStringFUTF16( + IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK, + description, + l10n_util::GetStringUTF16(ssl.ran_insecure_content() ? + IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_ERROR : + IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_WARNING))); } } sections_.push_back(SectionInfo( |