summaryrefslogtreecommitdiffstats
path: root/base/sys_string_conversions.h
diff options
context:
space:
mode:
authormirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-08 19:04:54 +0000
committermirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-08 19:04:54 +0000
commita2494cb564bee20bd59457293537599364a2863d (patch)
tree87233d47cdb31747e036d9446f4332c6fe9ca6ee /base/sys_string_conversions.h
parent87258a289e1d0732af8716d0aa5e910fc8c955be (diff)
downloadchromium_src-a2494cb564bee20bd59457293537599364a2863d.zip
chromium_src-a2494cb564bee20bd59457293537599364a2863d.tar.gz
chromium_src-a2494cb564bee20bd59457293537599364a2863d.tar.bz2
Fix NSString conversions to treat a null NSString as a string of length 0, instead of crashing. This allows Cocoa to use null objects as empties, as is its wont, and we only run a check when needed.
This CL also removes the now-superfluous checks for null NSStrings from BugReportWindowController. A cursory look through the code shows that there are many places where a check for null precedes a call to an NSString conversion; filed another bug against myself to go through and fix all of these (http://code.google.com/p/chromium/issues/detail?id=27055). Also filed a bug to expand unit tests for NSString conversion methods (http://code.google.com/p/chromium/issues/detail?id=27059). Review URL: http://codereview.chromium.org/371057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/sys_string_conversions.h')
-rw-r--r--base/sys_string_conversions.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/base/sys_string_conversions.h b/base/sys_string_conversions.h
index 18be826..edf4dd2 100644
--- a/base/sys_string_conversions.h
+++ b/base/sys_string_conversions.h
@@ -71,7 +71,8 @@ std::string SysCFStringRefToUTF8(CFStringRef ref);
string16 SysCFStringRefToUTF16(CFStringRef ref);
std::wstring SysCFStringRefToWide(CFStringRef ref);
-// Same, but accepts NSString input.
+// Same, but accepts NSString input. Converts nil NSString* to the appropriate
+// string type of length 0.
std::string SysNSStringToUTF8(NSString* ref);
string16 SysNSStringToUTF16(NSString* ref);
std::wstring SysNSStringToWide(NSString* ref);