diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-24 22:17:06 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-24 22:17:06 +0000 |
| commit | d70539de3df8f214397881727229a7786da9be35 (patch) | |
| tree | d10df8d461702c8de9b6df045955ee2226edc046 /chrome/browser/character_encoding.h | |
| parent | 16792a730c621ed32aa53b57d57e6c88e232ea02 (diff) | |
| download | chromium_src-d70539de3df8f214397881727229a7786da9be35.zip chromium_src-d70539de3df8f214397881727229a7786da9be35.tar.gz chromium_src-d70539de3df8f214397881727229a7786da9be35.tar.bz2 | |
Replace std:;wstring with std::string and string16 in locale-name related APIs.
1. Change the locale param to be std::string because they're always ASCII and change call-sites accordingly.
2. Add GetStringFUTF16 to l10n_util. On Windows, they're inline helpers calling the correspondingGetStringF returning wstring while on Mac/Linux, they just return the result of |string16 GetStringF|without converting to wstring.
This is part 1 of the fix for issue 8647. Some of newly introduced conversions are temporary and will be removed later (e.g. ASCIIToWide applied to the result of GetApplicationLocale in a few places).
Note : this CL will be landed after http://codereview.chromium.org/147038 is landed.
BUG=8647 (http://crbug.com/8647)
TEST=Pass l10n_util_unittest and other unit tests
Review URL: http://codereview.chromium.org/126223
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/character_encoding.h')
| -rw-r--r-- | chrome/browser/character_encoding.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/character_encoding.h b/chrome/browser/character_encoding.h index a676403..e1b6d9e 100644 --- a/chrome/browser/character_encoding.h +++ b/chrome/browser/character_encoding.h @@ -79,7 +79,7 @@ class CharacterEncoding { // is from user recently selected. THIS FUNCTION IS NOT THREADSAFE. You must // run this function only in UI thread. static const std::vector<EncodingInfo>* GetCurrentDisplayEncodings( - const std::wstring& locale, + const std::string& locale, const std::wstring& locale_encodings, const std::wstring& recently_select_encodings); |