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

Unified Diff: chrome/browser/geolocation/geolocation_exceptions_table_model.cc

Issue 5959008: Remove wstring from l10n_util. Part 2.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years 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/download/download_util.cc ('k') | chrome/browser/gtk/download_item_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/geolocation/geolocation_exceptions_table_model.cc
===================================================================
--- chrome/browser/geolocation/geolocation_exceptions_table_model.cc (revision 70233)
+++ chrome/browser/geolocation/geolocation_exceptions_table_model.cc (working copy)
@@ -152,24 +152,29 @@
// origin "embedded on any other site", so this row will never appear. If
// we add the ability to add/edit exceptions, we'll need to decide when to
// display this and how "removing" it will function.
- return indent +
- l10n_util::GetString(IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ANY_OTHER);
+ return indent + UTF16ToWideHack(l10n_util::GetStringUTF16(
+ IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ANY_OTHER));
}
- return indent + l10n_util::GetStringF(
+ return indent + UTF16ToWideHack(l10n_util::GetStringFUTF16(
IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ON_HOST,
- content_settings_helper::OriginToWString(entry.embedding_origin));
+ WideToUTF16Hack(
+ content_settings_helper::OriginToWString(entry.embedding_origin))));
}
if (column_id == IDS_EXCEPTIONS_ACTION_HEADER) {
switch (entry.setting) {
case CONTENT_SETTING_ALLOW:
- return l10n_util::GetString(IDS_EXCEPTIONS_ALLOW_BUTTON);
+ return UTF16ToWideHack(
+ l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON));
case CONTENT_SETTING_BLOCK:
- return l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON);
+ return UTF16ToWideHack(
+ l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON));
case CONTENT_SETTING_ASK:
- return l10n_util::GetString(IDS_EXCEPTIONS_ASK_BUTTON);
+ return UTF16ToWideHack(
+ l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ASK_BUTTON));
case CONTENT_SETTING_DEFAULT:
- return l10n_util::GetString(IDS_EXCEPTIONS_NOT_SET_BUTTON);
+ return UTF16ToWideHack(
+ l10n_util::GetStringUTF16(IDS_EXCEPTIONS_NOT_SET_BUTTON));
default:
break;
}
« no previous file with comments | « chrome/browser/download/download_util.cc ('k') | chrome/browser/gtk/download_item_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698