diff options
Diffstat (limited to 'chrome/browser/character_encoding.cc')
| -rw-r--r-- | chrome/browser/character_encoding.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc index 841b48b..dd15587 100644 --- a/chrome/browser/character_encoding.cc +++ b/chrome/browser/character_encoding.cc @@ -331,10 +331,18 @@ std::wstring CharacterEncoding::GetCanonicalEncodingNameByAliasName( WideToASCII(alias_name).c_str(), "IANA", &error_code); } - if (canonical_name) + if (canonical_name) { + // TODO(jnd) use a map to handle all customized {alias, canonical} + // encoding mappings if we have more than one pair. + // We don't want to add an unnecessary charset to the encoding menu, so we + // alias 'US-ASCII' to 'ISO-8859-1' in our UI without touching WebKit. + // http://crbug.com/15801. + if (alias_name == L"US-ASCII") + return GetCanonicalEncodingNameByCommandId(IDC_ENCODING_ISO88591); return ASCIIToWide(canonical_name); - else + } else { return std::wstring(); + } } // Static |