| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/sys_string_conversions.h" | 5 #include "base/sys_string_conversions.h" |
| 6 | 6 |
| 7 #import <Foundation/Foundation.h> | 7 #import <Foundation/Foundation.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 } | 145 } |
| 146 | 146 |
| 147 CFStringRef SysUTF8ToCFStringRef(const std::string& utf8) { | 147 CFStringRef SysUTF8ToCFStringRef(const std::string& utf8) { |
| 148 return STLStringToCFStringWithEncodingsT(utf8, kNarrowStringEncoding); | 148 return STLStringToCFStringWithEncodingsT(utf8, kNarrowStringEncoding); |
| 149 } | 149 } |
| 150 | 150 |
| 151 CFStringRef SysUTF16ToCFStringRef(const string16& utf16) { | 151 CFStringRef SysUTF16ToCFStringRef(const string16& utf16) { |
| 152 return STLStringToCFStringWithEncodingsT(utf16, kMediumStringEncoding); | 152 return STLStringToCFStringWithEncodingsT(utf16, kMediumStringEncoding); |
| 153 } | 153 } |
| 154 | 154 |
| 155 CFStringRef SysWideToCFStringRef(const std::wstring& wide) { | |
| 156 return STLStringToCFStringWithEncodingsT(wide, kWideStringEncoding); | |
| 157 } | |
| 158 | |
| 159 NSString* SysUTF8ToNSString(const std::string& utf8) { | 155 NSString* SysUTF8ToNSString(const std::string& utf8) { |
| 160 return (NSString*)base::mac::CFTypeRefToNSObjectAutorelease( | 156 return (NSString*)base::mac::CFTypeRefToNSObjectAutorelease( |
| 161 SysUTF8ToCFStringRef(utf8)); | 157 SysUTF8ToCFStringRef(utf8)); |
| 162 } | 158 } |
| 163 | 159 |
| 164 NSString* SysUTF16ToNSString(const string16& utf16) { | 160 NSString* SysUTF16ToNSString(const string16& utf16) { |
| 165 return (NSString*)base::mac::CFTypeRefToNSObjectAutorelease( | 161 return (NSString*)base::mac::CFTypeRefToNSObjectAutorelease( |
| 166 SysUTF16ToCFStringRef(utf16)); | 162 SysUTF16ToCFStringRef(utf16)); |
| 167 } | 163 } |
| 168 | 164 |
| 169 NSString* SysWideToNSString(const std::wstring& wide) { | |
| 170 return (NSString*)base::mac::CFTypeRefToNSObjectAutorelease( | |
| 171 SysWideToCFStringRef(wide)); | |
| 172 } | |
| 173 | |
| 174 std::string SysCFStringRefToUTF8(CFStringRef ref) { | 165 std::string SysCFStringRefToUTF8(CFStringRef ref) { |
| 175 return CFStringToSTLStringWithEncodingT<std::string>(ref, | 166 return CFStringToSTLStringWithEncodingT<std::string>(ref, |
| 176 kNarrowStringEncoding); | 167 kNarrowStringEncoding); |
| 177 } | 168 } |
| 178 | 169 |
| 179 string16 SysCFStringRefToUTF16(CFStringRef ref) { | 170 string16 SysCFStringRefToUTF16(CFStringRef ref) { |
| 180 return CFStringToSTLStringWithEncodingT<string16>(ref, | 171 return CFStringToSTLStringWithEncodingT<string16>(ref, |
| 181 kMediumStringEncoding); | 172 kMediumStringEncoding); |
| 182 } | 173 } |
| 183 | 174 |
| 184 std::wstring SysCFStringRefToWide(CFStringRef ref) { | |
| 185 return CFStringToSTLStringWithEncodingT<std::wstring>(ref, | |
| 186 kWideStringEncoding); | |
| 187 } | |
| 188 | |
| 189 std::string SysNSStringToUTF8(NSString* nsstring) { | 175 std::string SysNSStringToUTF8(NSString* nsstring) { |
| 190 if (!nsstring) | 176 if (!nsstring) |
| 191 return std::string(); | 177 return std::string(); |
| 192 return SysCFStringRefToUTF8(reinterpret_cast<CFStringRef>(nsstring)); | 178 return SysCFStringRefToUTF8(reinterpret_cast<CFStringRef>(nsstring)); |
| 193 } | 179 } |
| 194 | 180 |
| 195 string16 SysNSStringToUTF16(NSString* nsstring) { | 181 string16 SysNSStringToUTF16(NSString* nsstring) { |
| 196 if (!nsstring) | 182 if (!nsstring) |
| 197 return string16(); | 183 return string16(); |
| 198 return SysCFStringRefToUTF16(reinterpret_cast<CFStringRef>(nsstring)); | 184 return SysCFStringRefToUTF16(reinterpret_cast<CFStringRef>(nsstring)); |
| 199 } | 185 } |
| 200 | 186 |
| 201 std::wstring SysNSStringToWide(NSString* nsstring) { | |
| 202 if (!nsstring) | |
| 203 return std::wstring(); | |
| 204 return SysCFStringRefToWide(reinterpret_cast<CFStringRef>(nsstring)); | |
| 205 } | |
| 206 | |
| 207 } // namespace base | 187 } // namespace base |
| OLD | NEW |