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

Revert "Use a DictionaryValue everywhere instead of a string map."

Browse source 
This reverts commit 90cc10944a.
This commit is contained in:
Charlie Hess 2016-05-03 10:31:53 -07:00
parent 90cc10944a
commit f84a973d69
9 changed files with 38 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

17
atom/browser/mac/atom_application_delegate.mm
View file

@ -3,9 +3,8 @@
// found in the LICENSE file.
#import "atom/browser/mac/atom_application_delegate.h"
#import "atom/browser/mac/atom_application.h"
#import "atom/browser/mac/mac_native_converter.h"
#import "atom/browser/mac/atom_application.h"
#include "atom/browser/browser.h"
#include "base/strings/sys_string_conversions.h"
@ -65,11 +64,19 @@ continueUserActivity:(NSUserActivity *)userActivity
restorationHandler:(void (^)(NSArray *restorableObjects))restorationHandler {
std::string activity_type(base::SysNSStringToUTF8(userActivity.activityType));
MacNativeConverter* converter = [[MacNativeConverter alloc] init];
const base::DictionaryValue* user_info = [converter dictionaryToDictionaryValue:userActivity.userInfo];
std::map<std::string, std::string> user_info;
NSArray* keys = [userActivity.userInfo allKeys];
for (NSString* key in keys)
{
NSString* value = [userActivity.userInfo objectForKey:key];
std::string key_str(base::SysNSStringToUTF8(key));
std::string value_str(base::SysNSStringToUTF8(value));
user_info[key_str] = value_str;
}
atom::Browser* browser = atom::Browser::Get();
return browser->ContinueUserActivity(activity_type, *user_info) ? YES : NO;
return browser->ContinueUserActivity(activity_type, user_info) ? YES : NO;
}
@end