diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 22:10:13 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 22:10:13 +0000 |
| commit | 1308ac961fdd5148ce95e228fe192175584a5464 (patch) | |
| tree | 08f1e60a5b15a97aca4b24d1dd4e92e0dd1dc6ca /chrome/browser/notifications/notification_exceptions_table_model.cc | |
| parent | d546c48d90f0eaa592794f59e6a970b7b027db86 (diff) | |
| download | chromium_src-1308ac961fdd5148ce95e228fe192175584a5464.zip chromium_src-1308ac961fdd5148ce95e228fe192175584a5464.tar.gz chromium_src-1308ac961fdd5148ce95e228fe192175584a5464.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70281 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, 2 insertions, 5 deletions
diff --git a/chrome/browser/notifications/notification_exceptions_table_model.cc b/chrome/browser/notifications/notification_exceptions_table_model.cc index da40c70..a3326f9 100644 --- a/chrome/browser/notifications/notification_exceptions_table_model.cc +++ b/chrome/browser/notifications/notification_exceptions_table_model.cc @@ -7,7 +7,6 @@ #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" @@ -82,11 +81,9 @@ std::wstring NotificationExceptionsTableModel::GetText(int row, if (column_id == IDS_EXCEPTIONS_ACTION_HEADER) { switch (entry.setting) { case CONTENT_SETTING_ALLOW: - return UTF16ToWideHack( - l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON)); + return l10n_util::GetString(IDS_EXCEPTIONS_ALLOW_BUTTON); case CONTENT_SETTING_BLOCK: - return UTF16ToWideHack( - l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON)); + return l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON); default: break; } |