diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 20:08:33 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 20:08:33 +0000 |
| commit | 7c8c869c9cd34e78dc40d7c9840aa7b4b778ba0a (patch) | |
| tree | 3b997b69adc872122ada0872405017c9a4f18cc8 /chrome/browser/notifications/notification_exceptions_table_model.cc | |
| parent | 8d4db9d979a78a413fb28e02ae286643c86972ee (diff) | |
| download | chromium_src-7c8c869c9cd34e78dc40d7c9840aa7b4b778ba0a.zip chromium_src-7c8c869c9cd34e78dc40d7c9840aa7b4b778ba0a.tar.gz chromium_src-7c8c869c9cd34e78dc40d7c9840aa7b4b778ba0a.tar.bz2 | |
Remove wstring from l10n_util. Part 3.
BUG=9911
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6044006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/notification_exceptions_table_model.cc')
| -rw-r--r-- | chrome/browser/notifications/notification_exceptions_table_model.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/notifications/notification_exceptions_table_model.cc b/chrome/browser/notifications/notification_exceptions_table_model.cc index a3326f9..da40c70 100644 --- a/chrome/browser/notifications/notification_exceptions_table_model.cc +++ b/chrome/browser/notifications/notification_exceptions_table_model.cc @@ -7,6 +7,7 @@ #include "app/l10n_util.h" #include "app/table_model_observer.h" #include "base/auto_reset.h" +// TODO(avi): remove when conversions not needed any more #include "base/utf_string_conversions.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_helper.h" @@ -81,9 +82,11 @@ std::wstring NotificationExceptionsTableModel::GetText(int row, 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)); default: break; } |