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

Unified Diff: base/sys_string_conversions_mac.mm

Issue 10919185: Implement RemovableDeviceNotifications for Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address review comments Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: base/sys_string_conversions_mac.mm
diff --git a/base/sys_string_conversions_mac.mm b/base/sys_string_conversions_mac.mm
index d1e37432f92eac06cdd9e1fb224006313ef4573a..97c796974e65ddf5ab1834c6b28b9b150ffe249a 100644
--- a/base/sys_string_conversions_mac.mm
+++ b/base/sys_string_conversions_mac.mm
@@ -163,11 +163,15 @@ NSString* SysUTF16ToNSString(const string16& utf16) {
}
std::string SysCFStringRefToUTF8(CFStringRef ref) {
+ if (!ref)
+ return std::string();
return CFStringToSTLStringWithEncodingT<std::string>(ref,
kNarrowStringEncoding);
}
string16 SysCFStringRefToUTF16(CFStringRef ref) {
+ if (!ref)
+ return string16();
return CFStringToSTLStringWithEncodingT<string16>(ref,
kMediumStringEncoding);
}

Powered by Google App Engine
This is Rietveld 408576698