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

Side by Side Diff: base/sys_string_conversions_mac.mm

Issue 371057: Fix NSString conversions to treat a null NSString as a string of length 0, in... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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
« no previous file with comments | « base/sys_string_conversions.h ('k') | base/sys_string_conversions_mac_unittest.mm » ('j') | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 return CFStringToSTLStringWithEncodingT<string16>(ref, 177 return CFStringToSTLStringWithEncodingT<string16>(ref,
178 kMediumStringEncoding); 178 kMediumStringEncoding);
179 } 179 }
180 180
181 std::wstring SysCFStringRefToWide(CFStringRef ref) { 181 std::wstring SysCFStringRefToWide(CFStringRef ref) {
182 return CFStringToSTLStringWithEncodingT<std::wstring>(ref, 182 return CFStringToSTLStringWithEncodingT<std::wstring>(ref,
183 kWideStringEncoding); 183 kWideStringEncoding);
184 } 184 }
185 185
186 std::string SysNSStringToUTF8(NSString* nsstring) { 186 std::string SysNSStringToUTF8(NSString* nsstring) {
187 if (!nsstring)
188 return std::string();
187 return SysCFStringRefToUTF8(reinterpret_cast<CFStringRef>(nsstring)); 189 return SysCFStringRefToUTF8(reinterpret_cast<CFStringRef>(nsstring));
188 } 190 }
189 191
190 string16 SysNSStringToUTF16(NSString* nsstring) { 192 string16 SysNSStringToUTF16(NSString* nsstring) {
193 if (!nsstring)
194 return string16();
191 return SysCFStringRefToUTF16(reinterpret_cast<CFStringRef>(nsstring)); 195 return SysCFStringRefToUTF16(reinterpret_cast<CFStringRef>(nsstring));
192 } 196 }
193 197
194 std::wstring SysNSStringToWide(NSString* nsstring) { 198 std::wstring SysNSStringToWide(NSString* nsstring) {
199 if (!nsstring)
200 return std::wstring();
195 return SysCFStringRefToWide(reinterpret_cast<CFStringRef>(nsstring)); 201 return SysCFStringRefToWide(reinterpret_cast<CFStringRef>(nsstring));
196 } 202 }
197 203
198 } // namespace base 204 } // namespace base
OLDNEW
« no previous file with comments | « base/sys_string_conversions.h ('k') | base/sys_string_conversions_mac_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698