components/policy/core/browser/policy_error_map.cc - Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ to use the base:: namespace.

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: components/policy/core/browser/policy_error_map.cc

Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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 | « components/policy/core/browser/configuration_policy_pref_store.cc ('k') | components/policy/core/common/policy_loader_win_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/policy/core/browser/policy_error_map.cc

diff --git a/components/policy/core/browser/policy_error_map.cc b/components/policy/core/browser/policy_error_map.cc

index 95708ac70d104ef58ffd07084b589640f84d1566..611260d3f8378b9850f90457cb857b44660b8cad 100644

--- a/components/policy/core/browser/policy_error_map.cc

+++ b/components/policy/core/browser/policy_error_map.cc

@@ -138,14 +138,15 @@ void PolicyErrorMap::Convert(const PendingError& error) {

base::string16 submessage;

if (error.has_replacement) {

submessage = l10n_util::GetStringFUTF16(error.message_id,

- ASCIIToUTF16(error.replacement));

+ base::ASCIIToUTF16(

+ error.replacement));

} else {

submessage = l10n_util::GetStringUTF16(error.message_id);

}

base::string16 message;

if (!error.subkey.empty()) {

message = l10n_util::GetStringFUTF16(IDS_POLICY_SUBKEY_ERROR,

- ASCIIToUTF16(error.subkey),

+ base::ASCIIToUTF16(error.subkey),

submessage);

} else if (error.index >= 0) {

message = l10n_util::GetStringFUTF16(IDS_POLICY_LIST_ENTRY_ERROR,