| Index: chrome/browser/notifications/notification_exceptions_table_model.cc
|
| ===================================================================
|
| --- chrome/browser/notifications/notification_exceptions_table_model.cc (revision 70280)
|
| +++ chrome/browser/notifications/notification_exceptions_table_model.cc (working copy)
|
| @@ -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 @@
|
| 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;
|
| }
|
|
|