summaryrefslogtreecommitdiffstats
path: root/chrome/browser/content_exceptions_table_model.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-28 23:29:42 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-28 23:29:42 +0000
commit42197a2a59f7d74ab299dce1be5c7831c3bf49b0 (patch)
treebbeac88b36d834a55f0f01eb85326dc012e0f1fa /chrome/browser/content_exceptions_table_model.cc
parentf61ba8cfb9b5ef812c131de7860433cd832a60ff (diff)
downloadchromium_src-42197a2a59f7d74ab299dce1be5c7831c3bf49b0.zip
chromium_src-42197a2a59f7d74ab299dce1be5c7831c3bf49b0.tar.gz
chromium_src-42197a2a59f7d74ab299dce1be5c7831c3bf49b0.tar.bz2
Remove wstring from l10n_util. Part 2.
BUG=9911 TEST=no visible changes; all tests pass Review URL: http://codereview.chromium.org/5959008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_exceptions_table_model.cc')
-rw-r--r--chrome/browser/content_exceptions_table_model.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/content_exceptions_table_model.cc b/chrome/browser/content_exceptions_table_model.cc
index ee92157..dad02b9 100644
--- a/chrome/browser/content_exceptions_table_model.cc
+++ b/chrome/browser/content_exceptions_table_model.cc
@@ -110,13 +110,17 @@ std::wstring ContentExceptionsTableModel::GetText(int row, int column_id) {
case IDS_EXCEPTIONS_ACTION_HEADER:
switch (entry.second) {
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_SESSION_ONLY:
- return l10n_util::GetString(IDS_EXCEPTIONS_SESSION_ONLY_BUTTON);
+ return UTF16ToWideHack(
+ l10n_util::GetStringUTF16(IDS_EXCEPTIONS_SESSION_ONLY_BUTTON));
default:
NOTREACHED();
}