diff options
Diffstat (limited to 'chromium/base/strings/utf_string_conversions.h')
| -rw-r--r-- | chromium/base/strings/utf_string_conversions.h | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/chromium/base/strings/utf_string_conversions.h b/chromium/base/strings/utf_string_conversions.h index 3461aa491df..13e0b7193be 100644 --- a/chromium/base/strings/utf_string_conversions.h +++ b/chromium/base/strings/utf_string_conversions.h @@ -39,34 +39,15 @@ BASE_EXPORT bool UTF16ToUTF8(const char16* src, size_t src_len, std::string* output); BASE_EXPORT std::string UTF16ToUTF8(const string16& utf16); -// We are trying to get rid of wstring as much as possible, but it's too big -// a mess to do it all at once. These conversions should be used when we -// really should just be passing a string16 around, but we haven't finished -// porting whatever module uses wstring and the conversion is being used as a -// stopcock. This makes it easy to grep for the ones that should be removed. -#if defined(OS_WIN) -# define WideToUTF16Hack -# define UTF16ToWideHack -#else -# define WideToUTF16Hack WideToUTF16 -# define UTF16ToWideHack UTF16ToWide -#endif - // These convert an ASCII string, typically a hardcoded constant, to a // UTF16/Wide string. BASE_EXPORT std::wstring ASCIIToWide(const StringPiece& ascii); BASE_EXPORT string16 ASCIIToUTF16(const StringPiece& ascii); -} // namespace base +// Converts to 7-bit ASCII by truncating. The result must be known to be ASCII +// beforehand. +BASE_EXPORT std::string UTF16ToASCII(const string16& utf16); -// TODO(brettw) remove these when callers are fixed up. -using base::WideToUTF8; -using base::UTF8ToWide; -using base::WideToUTF16; -using base::UTF16ToWide; -using base::UTF8ToUTF16; -using base::UTF16ToUTF8; -using base::ASCIIToWide; -using base::ASCIIToUTF16; +} // namespace base #endif // BASE_STRINGS_UTF_STRING_CONVERSIONS_H_ |