Chromium Code Reviews| Index: chrome/browser/ssl/ssl_blocking_page.cc |
| =================================================================== |
| --- chrome/browser/ssl/ssl_blocking_page.cc (revision 113638) |
| +++ chrome/browser/ssl/ssl_blocking_page.cc (working copy) |
| @@ -6,6 +6,7 @@ |
| #include "base/i18n/rtl.h" |
| #include "base/metrics/histogram.h" |
| +#include "base/string16.h" |
| #include "base/string_piece.h" |
| #include "base/utf_string_conversions.h" |
| #include "base/values.h" |
| @@ -89,6 +90,10 @@ |
| l10n_util::GetStringUTF16(IDS_SSL_BLOCKING_PAGE_PROCEED)); |
| strings.SetString("exit", |
| l10n_util::GetStringUTF16(IDS_SSL_BLOCKING_PAGE_EXIT)); |
| + strings.SetString("description", |
| + error_info.details() + ASCIIToUTF16(" ") + |
|
Ryan Sleevi
2011/12/11 21:18:34
I didn't think it was permissible to concatenate t
|
| + l10n_util::GetStringUTF16( |
| + IDS_SSL_BLOCKING_PAGE_SHOULD_NOT_PROCEED)); |
| } else { |
| resource_id = IDR_SSL_ERROR_HTML; |
| strings.SetString("title", |
| @@ -168,7 +173,7 @@ |
| void SSLBlockingPage::SetExtraInfo( |
| DictionaryValue* strings, |
| const std::vector<string16>& extra_info) { |
| - DCHECK(extra_info.size() < 5); // We allow 5 paragraphs max. |
| + DCHECK_LT(extra_info.size(), 5U); // We allow 5 paragraphs max. |
| const char* keys[5] = { |
| "moreInfo1", "moreInfo2", "moreInfo3", "moreInfo4", "moreInfo5" |
| }; |