summaryrefslogtreecommitdiffstats
path: root/base/utf_string_conversions.h
diff options
context:
space:
mode:
Diffstat (limited to 'base/utf_string_conversions.h')
-rw-r--r--base/utf_string_conversions.h21
1 files changed, 21 insertions, 0 deletions
diff --git a/base/utf_string_conversions.h b/base/utf_string_conversions.h
index 5a391fa..83cd03b 100644
--- a/base/utf_string_conversions.h
+++ b/base/utf_string_conversions.h
@@ -11,6 +11,8 @@
#include "base/string16.h"
#include "base/string_piece.h"
+namespace base {
+
// These convert between UTF-8, -16, and -32 strings. They are potentially slow,
// so avoid unnecessary conversions. The low-level versions return a boolean
// indicating whether the conversion was 100% valid. In this case, it will still
@@ -55,4 +57,23 @@ BASE_EXPORT std::string UTF16ToUTF8(const string16& utf16);
BASE_EXPORT std::wstring ASCIIToWide(const base::StringPiece& ascii);
BASE_EXPORT string16 ASCIIToUTF16(const base::StringPiece& ascii);
+} // namespace base
+
+// TODO(brettw) remove these usings once all code has been converted to using
+// the namespaces.
+using base::WideToUTF8;
+using base::WideToUTF8;
+using base::UTF8ToWide;
+using base::UTF8ToWide;
+using base::WideToUTF16;
+using base::WideToUTF16;
+using base::UTF16ToWide;
+using base::UTF16ToWide;
+using base::UTF8ToUTF16;
+using base::UTF8ToUTF16;
+using base::UTF16ToUTF8;
+using base::UTF16ToUTF8;
+using base::ASCIIToWide;
+using base::ASCIIToUTF16;
+
#endif // BASE_UTF_STRING_CONVERSIONS_H_