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

15
atom/browser/browser_mac.mm
View file

@ -6,7 +6,6 @@
#include "atom/browser/mac/atom_application.h"
#include "atom/browser/mac/atom_application_delegate.h"
#include "atom/browser/mac/mac_native_converter.h"
#include "atom/browser/native_window.h"
#include "atom/browser/window_list.h"
#include "base/mac/bundle_locations.h"
@ -88,12 +87,20 @@ bool Browser::IsDefaultProtocolClient(const std::string& protocol) {
void Browser::SetAppUserModelID(const base::string16& name) {
}
void Browser::SetUserActivity(const std::string& type, const base::DictionaryValue& user_info) {
void Browser::SetUserActivity(const std::string& type, const std::map<std::string, std::string>& user_info) {
NSString* type_ns = [NSString stringWithUTF8String:type.c_str()];
NSUserActivity *user_activity = [[NSUserActivity alloc] initWithActivityType:type_ns];
MacNativeConverter* converter = [[MacNativeConverter alloc] init];
user_activity.userInfo = [converter dictionaryFromDictionaryValue:user_info];
NSMutableArray* user_info_args = [[NSMutableArray alloc] init];
for (auto const &pair : user_info) {
NSString* value_ns = [NSString stringWithUTF8String:pair.second.c_str()];
NSString* key_ns = [NSString stringWithUTF8String:pair.first.c_str()];
[user_info_args addObject:value_ns];
[user_info_args addObject:key_ns];
}
user_activity.userInfo = [[NSDictionary alloc] initWithObjectsAndKeys:user_info_args, nil];
[user_activity becomeCurrent];
}