diff options
Diffstat (limited to 'chrome/browser/notifications')
| -rw-r--r-- | chrome/browser/notifications/notification_exceptions_table_model.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/notifications/notification_exceptions_table_model_unittest.cc | 16 |
2 files changed, 16 insertions, 7 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; } diff --git a/chrome/browser/notifications/notification_exceptions_table_model_unittest.cc b/chrome/browser/notifications/notification_exceptions_table_model_unittest.cc index 18a998b..4752a80 100644 --- a/chrome/browser/notifications/notification_exceptions_table_model_unittest.cc +++ b/chrome/browser/notifications/notification_exceptions_table_model_unittest.cc @@ -5,6 +5,7 @@ #include "chrome/browser/notifications/notification_exceptions_table_model.h" #include "app/l10n_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/test/testing_profile.h" @@ -75,27 +76,32 @@ TEST_F(NotificationExceptionsTableModelTest, AlphabeticalOrder) { EXPECT_EQ(L"allowed.com", model_->GetText(0, IDS_EXCEPTIONS_HOSTNAME_HEADER)); - EXPECT_EQ(l10n_util::GetString(IDS_EXCEPTIONS_ALLOW_BUTTON), + EXPECT_EQ(UTF16ToWideHack( + l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON)), model_->GetText(0, IDS_EXCEPTIONS_ACTION_HEADER)); EXPECT_EQ(L"denied.com", model_->GetText(1, IDS_EXCEPTIONS_HOSTNAME_HEADER)); - EXPECT_EQ(l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON), + EXPECT_EQ(UTF16ToWideHack( + l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON)), model_->GetText(1, IDS_EXCEPTIONS_ACTION_HEADER)); EXPECT_EQ(L"denied2.com", model_->GetText(2, IDS_EXCEPTIONS_HOSTNAME_HEADER)); - EXPECT_EQ(l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON), + EXPECT_EQ(UTF16ToWideHack( + l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON)), model_->GetText(2, IDS_EXCEPTIONS_ACTION_HEADER)); EXPECT_EQ(L"e-allowed2.com", model_->GetText(3, IDS_EXCEPTIONS_HOSTNAME_HEADER)); - EXPECT_EQ(l10n_util::GetString(IDS_EXCEPTIONS_ALLOW_BUTTON), + EXPECT_EQ(UTF16ToWideHack( + l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON)), model_->GetText(3, IDS_EXCEPTIONS_ACTION_HEADER)); EXPECT_EQ(L"f-denied3.com", model_->GetText(4, IDS_EXCEPTIONS_HOSTNAME_HEADER)); - EXPECT_EQ(l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON), + EXPECT_EQ(UTF16ToWideHack( + l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON)), model_->GetText(4, IDS_EXCEPTIONS_ACTION_HEADER)); } |