Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(582)

Unified Diff: chrome/browser/ssl/ssl_policy.cc

Issue 31014: Port DictionaryValue to use string16 instead of wstring. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ssl/ssl_blocking_page.cc ('k') | chrome/common/json_value_serializer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/ssl_policy.cc
===================================================================
--- chrome/browser/ssl/ssl_policy.cc (revision 10828)
+++ chrome/browser/ssl/ssl_policy.cc (working copy)
@@ -76,18 +76,26 @@
// Let's build the html error page.
DictionaryValue strings;
- strings.SetString(L"title", l10n_util::GetString(IDS_SSL_ERROR_PAGE_TITLE));
- strings.SetString(L"headLine", error_info.title());
- strings.SetString(L"description", error_info.details());
- strings.SetString(L"moreInfoTitle",
- l10n_util::GetString(IDS_CERT_ERROR_EXTRA_INFO_TITLE));
+ strings.SetString(
+ ASCIIToUTF16("title"),
+ WideToUTF16Hack(l10n_util::GetString(IDS_SSL_ERROR_PAGE_TITLE)));
+ strings.SetString(ASCIIToUTF16("headLine"),
+ WideToUTF16Hack(error_info.title()));
+ strings.SetString(ASCIIToUTF16("description"),
+ WideToUTF16Hack(error_info.details()));
+ strings.SetString(
+ ASCIIToUTF16("moreInfoTitle"),
+ WideToUTF16Hack(l10n_util::GetString(IDS_CERT_ERROR_EXTRA_INFO_TITLE)));
SSLBlockingPage::SetExtraInfo(&strings, error_info.extra_information());
- strings.SetString(L"back", l10n_util::GetString(IDS_SSL_ERROR_PAGE_BACK));
+ strings.SetString(
+ ASCIIToUTF16("back"),
+ WideToUTF16Hack(l10n_util::GetString(IDS_SSL_ERROR_PAGE_BACK)));
- strings.SetString(L"textdirection",
+ strings.SetString(
+ ASCIIToUTF16("textdirection"),
(l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) ?
- L"rtl" : L"ltr");
+ ASCIIToUTF16("rtl") : ASCIIToUTF16("ltr"));
static const StringPiece html(
ResourceBundle::GetSharedInstance().GetRawDataResource(
« no previous file with comments | « chrome/browser/ssl/ssl_blocking_page.cc ('k') | chrome/common/json_value_serializer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698