mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Value first, key second.

Browse source
This commit is contained in:
Charlie Hess 2016-04-30 11:17:29 -07:00
parent cea1b49db0
commit 05493502ea
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/browser_mac.mm
View file

@ -69,7 +69,7 @@ bool Browser::IsDefaultProtocolClient(const std::string& protocol) {
return false; return false;
NSString* protocol_ns = [NSString stringWithUTF8String:protocol.c_str()]; NSString* protocol_ns = [NSString stringWithUTF8String:protocol.c_str()];
CFStringRef bundle = CFStringRef bundle =
LSCopyDefaultHandlerForURLScheme(base::mac::NSToCFCast(protocol_ns)); LSCopyDefaultHandlerForURLScheme(base::mac::NSToCFCast(protocol_ns));
NSString* bundleId = static_cast<NSString*>( NSString* bundleId = static_cast<NSString*>(
@ -77,7 +77,7 @@ bool Browser::IsDefaultProtocolClient(const std::string& protocol) {
if (!bundleId) if (!bundleId)
return false; return false;
// Ensure the comparison is case-insensitive // Ensure the comparison is case-insensitive
// as LS does not persist the case of the bundle id. // as LS does not persist the case of the bundle id.
NSComparisonResult result = NSComparisonResult result =
[bundleId caseInsensitiveCompare:identifier]; [bundleId caseInsensitiveCompare:identifier];
@ -93,11 +93,11 @@ void Browser::SetUserActivity(const std::string& type, const std::map<std::strin
NSMutableArray* user_info_args = [[NSMutableArray alloc] init]; NSMutableArray* user_info_args = [[NSMutableArray alloc] init];
for (auto const &pair : user_info) { for (auto const &pair : user_info) {
NSString* key_ns = [NSString stringWithUTF8String:pair.first.c_str()];
NSString* value_ns = [NSString stringWithUTF8String:pair.second.c_str()]; NSString* value_ns = [NSString stringWithUTF8String:pair.second.c_str()];
NSString* key_ns = [NSString stringWithUTF8String:pair.first.c_str()];
[user_info_args addObject:key_ns];
[user_info_args addObject:value_ns]; [user_info_args addObject:value_ns];
[user_info_args addObject:key_ns];
} }
user_activity.userInfo = [[NSDictionary alloc] initWithObjectsAndKeys:user_info_args, nil]; user_activity.userInfo = [[NSDictionary alloc] initWithObjectsAndKeys:user_info_args, nil];