OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/page_info_model.h" | 5 #include "chrome/browser/page_info_model.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 description.assign( | 131 description.assign( |
132 l10n_util::GetStringFUTF16( | 132 l10n_util::GetStringFUTF16( |
133 IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT, | 133 IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT, |
134 subject_name)); | 134 subject_name)); |
135 } else { | 135 } else { |
136 description.assign( | 136 description.assign( |
137 l10n_util::GetStringFUTF16( | 137 l10n_util::GetStringFUTF16( |
138 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT, | 138 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT, |
139 subject_name, | 139 subject_name, |
140 IntToString16(ssl.security_bits()))); | 140 IntToString16(ssl.security_bits()))); |
141 if (ssl.has_mixed_content()) { | 141 if (ssl.displayed_mixed_content() || ssl.ran_mixed_content()) { |
142 state = false; | 142 state = false; |
143 description.assign( | 143 description.assign( |
144 l10n_util::GetStringFUTF16( | 144 l10n_util::GetStringFUTF16( |
145 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK, | 145 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK, |
146 description, | 146 description, |
147 l10n_util::GetStringUTF16( | 147 l10n_util::GetStringUTF16(ssl.ran_mixed_content() ? |
| 148 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_MIXED_CONTENT_ERROR : |
148 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_MIXED_CONTENT_WARNING))); | 149 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_MIXED_CONTENT_WARNING))); |
149 } | 150 } |
150 } | 151 } |
151 sections_.push_back(SectionInfo( | 152 sections_.push_back(SectionInfo( |
152 state, | 153 state, |
153 l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_CONNECTION_TITLE), | 154 l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_CONNECTION_TITLE), |
154 head_line, | 155 head_line, |
155 description)); | 156 description)); |
156 | 157 |
157 // Request the number of visits. | 158 // Request the number of visits. |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, | 209 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, |
209 WideToUTF16(base::TimeFormatShortDate(first_visit))))); | 210 WideToUTF16(base::TimeFormatShortDate(first_visit))))); |
210 } | 211 } |
211 observer_->ModelChanged(); | 212 observer_->ModelChanged(); |
212 } | 213 } |
213 | 214 |
214 // static | 215 // static |
215 void PageInfoModel::RegisterPrefs(PrefService* prefs) { | 216 void PageInfoModel::RegisterPrefs(PrefService* prefs) { |
216 prefs->RegisterDictionaryPref(prefs::kPageInfoWindowPlacement); | 217 prefs->RegisterDictionaryPref(prefs::kPageInfoWindowPlacement); |
217 } | 218 } |
OLD | NEW |