chrome/browser/notifications/notification_exceptions_table_model.cc - Issue 5989012: Revert 70281 - Revert 70271 - Remove wstring from l10n_util. Part 3....

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/notifications/notification_exceptions_table_model.cc

Issue 5989012: Revert 70281 - Revert 70271 - Remove wstring from l10n_util. Part 3.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/importer/importer_list.cc ('k') | chrome/browser/notifications/notification_exceptions_table_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/notification_exceptions_table_model.cc

===================================================================

--- chrome/browser/notifications/notification_exceptions_table_model.cc (revision 70282)

+++ chrome/browser/notifications/notification_exceptions_table_model.cc (working copy)

@@ -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 @@

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;

}