Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(264)

Side by Side Diff: base/sys_string_conversions_mac.mm

Issue 10818016: [OSX] Remove wide->NSString conversion (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« base/sys_string_conversions.h ('K') | « base/sys_string_conversions.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 NSString* SysUTF8ToNSString(const std::string& utf8) { 159 NSString* SysUTF8ToNSString(const std::string& utf8) {
160 return (NSString*)base::mac::CFTypeRefToNSObjectAutorelease( 160 return (NSString*)base::mac::CFTypeRefToNSObjectAutorelease(
161 SysUTF8ToCFStringRef(utf8)); 161 SysUTF8ToCFStringRef(utf8));
162 } 162 }
163 163
164 NSString* SysUTF16ToNSString(const string16& utf16) { 164 NSString* SysUTF16ToNSString(const string16& utf16) {
165 return (NSString*)base::mac::CFTypeRefToNSObjectAutorelease( 165 return (NSString*)base::mac::CFTypeRefToNSObjectAutorelease(
166 SysUTF16ToCFStringRef(utf16)); 166 SysUTF16ToCFStringRef(utf16));
167 } 167 }
168 168
169 NSString* SysWideToNSString(const std::wstring& wide) {
170 return (NSString*)base::mac::CFTypeRefToNSObjectAutorelease(
171 SysWideToCFStringRef(wide));
172 }
173
174 std::string SysCFStringRefToUTF8(CFStringRef ref) { 169 std::string SysCFStringRefToUTF8(CFStringRef ref) {
175 return CFStringToSTLStringWithEncodingT<std::string>(ref, 170 return CFStringToSTLStringWithEncodingT<std::string>(ref,
176 kNarrowStringEncoding); 171 kNarrowStringEncoding);
177 } 172 }
178 173
179 string16 SysCFStringRefToUTF16(CFStringRef ref) { 174 string16 SysCFStringRefToUTF16(CFStringRef ref) {
180 return CFStringToSTLStringWithEncodingT<string16>(ref, 175 return CFStringToSTLStringWithEncodingT<string16>(ref,
181 kMediumStringEncoding); 176 kMediumStringEncoding);
182 } 177 }
183 178
(...skipping 14 matching lines...) Expand all
198 return SysCFStringRefToUTF16(reinterpret_cast<CFStringRef>(nsstring)); 193 return SysCFStringRefToUTF16(reinterpret_cast<CFStringRef>(nsstring));
199 } 194 }
200 195
201 std::wstring SysNSStringToWide(NSString* nsstring) { 196 std::wstring SysNSStringToWide(NSString* nsstring) {
202 if (!nsstring) 197 if (!nsstring)
203 return std::wstring(); 198 return std::wstring();
204 return SysCFStringRefToWide(reinterpret_cast<CFStringRef>(nsstring)); 199 return SysCFStringRefToWide(reinterpret_cast<CFStringRef>(nsstring));
205 } 200 }
206 201
207 } // namespace base 202 } // namespace base
OLDNEW
« base/sys_string_conversions.h ('K') | « base/sys_string_conversions.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698