diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-24 16:24:13 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-25 14:13:32 +0100 |
| commit | 3f50c38dc070f4bb515c1b64450dae14f316474e (patch) | |
| tree | 29f309f9534e05c47244eedb438fc612578d133b /chrome/browser/character_encoding.cc | |
| parent | e23bef148f7be2bdf9c3cb2cd3aa5ceebf1190fb (diff) | |
| download | external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.zip external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.gz external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.bz2 | |
Merge Chromium at r10.0.634.0: Initial merge by git.
Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
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. |