diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-18 21:39:23 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-18 21:39:23 +0000 |
| commit | f224d57a86d8ed1ed6c4bca3c8a7150bf3c0ed14 (patch) | |
| tree | f6305290a1c4781138d7d5a4f410915846ae6766 /base/sys_string_conversions.h | |
| parent | 7a0220b27d9d9a9e5b870411c6a18edca1981767 (diff) | |
| download | chromium_src-f224d57a86d8ed1ed6c4bca3c8a7150bf3c0ed14.zip chromium_src-f224d57a86d8ed1ed6c4bca3c8a7150bf3c0ed14.tar.gz chromium_src-f224d57a86d8ed1ed6c4bca3c8a7150bf3c0ed14.tar.bz2 | |
Now that we deal with string16s, provide some useful conversions for them.
Review URL: http://codereview.chromium.org/21473
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/sys_string_conversions.h')
| -rw-r--r-- | base/sys_string_conversions.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/base/sys_string_conversions.h b/base/sys_string_conversions.h index 7b56a21..dbaa5a4 100644 --- a/base/sys_string_conversions.h +++ b/base/sys_string_conversions.h @@ -11,6 +11,7 @@ #include <string> #include "base/basictypes.h" +#include "base/string16.h" #if defined(OS_MACOSX) #include <CoreFoundation/CoreFoundation.h> @@ -57,18 +58,22 @@ std::string SysWideToMultiByte(const std::wstring& wide, uint32 code_page); // Creates a string, and returns it with a refcount of 1. You are responsible // for releasing it. Returns NULL on failure. CFStringRef SysUTF8ToCFStringRef(const std::string& utf8); +CFStringRef SysUTF16ToCFStringRef(const string16& utf16); CFStringRef SysWideToCFStringRef(const std::wstring& wide); // Same, but returns an autoreleased NSString. NSString* SysUTF8ToNSString(const std::string& utf8); +NSString* SysUTF16ToNSString(const string16& utf16); NSString* SysWideToNSString(const std::wstring& wide); // Converts a CFStringRef to an STL string. Returns an empty string on failure. std::string SysCFStringRefToUTF8(CFStringRef ref); +string16 SysCFStringRefToUTF16(CFStringRef ref); std::wstring SysCFStringRefToWide(CFStringRef ref); // Same, but accepts NSString input. std::string SysNSStringToUTF8(NSString* ref); +string16 SysNSStringToUTF16(NSString* ref); std::wstring SysNSStringToWide(NSString* ref); #endif // defined(OS_MACOSX) |