diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 22:37:45 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 22:37:45 +0000 |
| commit | d1318574ee4f31f1a8fbea9d8584c89c069af987 (patch) | |
| tree | 44914e9ea575a25c544b0ec9bc0925e7c2f3f0ea /chrome/browser/plugin_exceptions_table_model.cc | |
| parent | 1308ac961fdd5148ce95e228fe192175584a5464 (diff) | |
| download | chromium_src-d1318574ee4f31f1a8fbea9d8584c89c069af987.zip chromium_src-d1318574ee4f31f1a8fbea9d8584c89c069af987.tar.gz chromium_src-d1318574ee4f31f1a8fbea9d8584c89c069af987.tar.bz2 | |
Revert 70281 - Revert 70271 - Remove wstring from l10n_util. Part 3.
BUG=9911
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6044006
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/6051012
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/5989012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_exceptions_table_model.cc')
| -rw-r--r-- | chrome/browser/plugin_exceptions_table_model.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/plugin_exceptions_table_model.cc b/chrome/browser/plugin_exceptions_table_model.cc index 5b2a2c1..0dc7c8b 100644 --- a/chrome/browser/plugin_exceptions_table_model.cc +++ b/chrome/browser/plugin_exceptions_table_model.cc @@ -87,9 +87,11 @@ std::wstring PluginExceptionsTableModel::GetText(int row, int column_id) { case 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)); default: NOTREACHED(); } |