| Index: chrome/browser/ssl/ssl_blocking_page.cc
|
| ===================================================================
|
| --- chrome/browser/ssl/ssl_blocking_page.cc (revision 70233)
|
| +++ chrome/browser/ssl/ssl_blocking_page.cc (working copy)
|
| @@ -68,8 +68,8 @@
|
| // Let's build the html error page.
|
| DictionaryValue strings;
|
| SSLErrorInfo error_info = delegate_->GetSSLErrorInfo(handler_);
|
| - strings.SetString("headLine", WideToUTF16Hack(error_info.title()));
|
| - strings.SetString("description", WideToUTF16Hack(error_info.details()));
|
| + strings.SetString("headLine", error_info.title());
|
| + strings.SetString("description", error_info.details());
|
|
|
| strings.SetString("moreInfoTitle",
|
| l10n_util::GetStringUTF16(IDS_CERT_ERROR_EXTRA_INFO_TITLE));
|
| @@ -158,14 +158,14 @@
|
| // static
|
| void SSLBlockingPage::SetExtraInfo(
|
| DictionaryValue* strings,
|
| - const std::vector<std::wstring>& extra_info) {
|
| + const std::vector<string16>& extra_info) {
|
| DCHECK(extra_info.size() < 5); // We allow 5 paragraphs max.
|
| const char* keys[5] = {
|
| "moreInfo1", "moreInfo2", "moreInfo3", "moreInfo4", "moreInfo5"
|
| };
|
| int i;
|
| for (i = 0; i < static_cast<int>(extra_info.size()); i++) {
|
| - strings->SetString(keys[i], WideToUTF16Hack(extra_info[i]));
|
| + strings->SetString(keys[i], extra_info[i]);
|
| }
|
| for (; i < 5; i++) {
|
| strings->SetString(keys[i], "");
|
|
|