diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-28 16:55:57 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-28 16:55:57 +0000 |
| commit | d223f3bfefc0c92a216f21c4d84e844bb663c2a6 (patch) | |
| tree | f4982b4490fe13de645b445ab95f3c82c95cf8aa /chrome/browser/character_encoding.cc | |
| parent | bf570fb6773be4e4082b73c5b7a32fff5dc6663b (diff) | |
| download | chromium_src-d223f3bfefc0c92a216f21c4d84e844bb663c2a6.zip chromium_src-d223f3bfefc0c92a216f21c4d84e844bb663c2a6.tar.gz chromium_src-d223f3bfefc0c92a216f21c4d84e844bb663c2a6.tar.bz2 | |
Remove wstring from l10n_util. Part 1.
BUG=9911
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/5990008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/character_encoding.cc')
| -rw-r--r-- | chrome/browser/character_encoding.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc index 80bfc6b..4b0f92f 100644 --- a/chrome/browser/character_encoding.cc +++ b/chrome/browser/character_encoding.cc @@ -293,9 +293,9 @@ std::string GetEncodingCategoryStringByCommandId(int id) { CharacterEncoding::EncodingInfo::EncodingInfo(int id) : encoding_id(id) { - encoding_category_name = UTF8ToWide(GetEncodingCategoryStringByCommandId(id)); - encoding_display_name = UTF16ToWideHack( - GetCanonicalEncodingDisplayNameByCommandId(id)); + encoding_category_name = + UTF8ToUTF16(GetEncodingCategoryStringByCommandId(id)); + encoding_display_name = GetCanonicalEncodingDisplayNameByCommandId(id); } // Static. |