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

This reverts commit 90cc10944a64d9a4998a3d12a2559baa7705b3af.

diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc
index ee73e5b21517ea3c5a74ec65849c7d8c5fc53240..ec6cdce417c10501cd382d0b329a2ca6383c28d2 100644 (file)
--- a/atom/browser/api/atom_api_app.cc
+++ b/atom/browser/api/atom_api_app.cc
@@ -252,7 +252,7 @@ void App::OnFinishLaunching() {
 
 void App::OnContinueUserActivity(bool* prevent_default,
   const std::string& type,
-  const base::DictionaryValue& user_info) {
+  const std::map<std::string, std::string>& user_info) {
   *prevent_default = Emit("continue-activity", type, user_info);
 }
 

diff --git a/atom/browser/api/atom_api_app.h b/atom/browser/api/atom_api_app.h
index db510640fa6b939e75619596270744b85cad0233..321230d711e6427918455e809ce93b2491050066 100644 (file)
--- a/atom/browser/api/atom_api_app.h
+++ b/atom/browser/api/atom_api_app.h
@@ -74,7 +74,7 @@ class App : public AtomBrowserClient::Delegate,
   void OnLogin(LoginHandler* login_handler) override;
   void OnContinueUserActivity(bool* prevent_default,
     const std::string& type,
-    const base::DictionaryValue& user_info) override;
+    const std::map<std::string, std::string>& user_info) override;
 
   // content::ContentBrowserClient:
   void AllowCertificateError(

diff --git a/atom/browser/browser.cc b/atom/browser/browser.cc
index 62e0467e5d224c8a328ad5ccc7999c00caadc668..ee2a225246baba51136cc5111290f3aaf8392fc4 100644 (file)
--- a/atom/browser/browser.cc
+++ b/atom/browser/browser.cc
@@ -139,7 +139,8 @@ void Browser::Activate(bool has_visible_windows) {
 
 #if defined(OS_MACOSX)
 bool Browser::ContinueUserActivity(const std::string& type,
-                                   const base::DictionaryValue& user_info) {
+                                   const std::map<std::string,
+                                   std::string>& user_info) {
   bool prevent_default = false;
   FOR_EACH_OBSERVER(BrowserObserver,
                     observers_,

diff --git a/atom/browser/browser.h b/atom/browser/browser.h
index 4e282ed409aa37cdf54ec47ca83e40a6a0c87171..14f94a061e4e42ff3c1808953d05a970f8423d02 100644 (file)
--- a/atom/browser/browser.h
+++ b/atom/browser/browser.h
@@ -10,7 +10,6 @@
 #include <map>
 
 #include "base/macros.h"
-#include "base/values.h"
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
@@ -96,11 +95,11 @@ class Browser : public WindowListObserver {
 
   // Creates an activity and sets it as the one currently in use.
   void SetUserActivity(const std::string& type,
-                       const base::DictionaryValue& user_info);
+                       const std::map<std::string, std::string>& user_info);
 
   // Resumes an activity via hand-off.
   bool ContinueUserActivity(const std::string& type,
-    const base::DictionaryValue& user_info);
+    const std::map<std::string, std::string>& user_info);
 
   // Bounce the dock icon.
   enum BounceType {

diff --git a/atom/browser/browser_mac.mm b/atom/browser/browser_mac.mm
index 594624f511c743a01a435338f1cbe663ae964ced..a12bd8c880993ad564f9b7d4911f595325489640 100644 (file)
--- a/atom/browser/browser_mac.mm
+++ b/atom/browser/browser_mac.mm
@@ -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];
 }
 

diff --git a/atom/browser/browser_observer.h b/atom/browser/browser_observer.h
index e297e16d80dcd86e2ac98dfd4dcffd986447452d..4ad001370c0b715afa9c55f3f048bfab5b91a1c3 100644 (file)
--- a/atom/browser/browser_observer.h
+++ b/atom/browser/browser_observer.h
@@ -8,8 +8,6 @@
 #include <string>
 #include <map>
 
-#include "base/values.h"
-
 namespace atom {
 
 class LoginHandler;
@@ -51,7 +49,7 @@ class BrowserObserver {
   // The browser wants to resume a user activity via handoff. (OS X only)
   virtual void OnContinueUserActivity(bool* prevent_default,
     const std::string& type,
-    const base::DictionaryValue& user_info) {}
+    const std::map<std::string, std::string>& user_info) {}
 
  protected:
   virtual ~BrowserObserver() {}

diff --git a/atom/browser/mac/atom_application_delegate.mm b/atom/browser/mac/atom_application_delegate.mm
index ffb0b988aa25e5c65c6dfa1bca9bd63b6de0aaac..f08cc84c46612468124f7d429d4a88fcc45ad5f4 100644 (file)
--- a/atom/browser/mac/atom_application_delegate.mm
+++ b/atom/browser/mac/atom_application_delegate.mm
@@ -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

diff --git a/atom/browser/mac/mac_native_converter.h b/atom/browser/mac/mac_native_converter.h
index fcd1997fd1ea3271c9188b3ad56536a0e53f12df..ac1a9a608d7069253b09d014004bee79596cd688 100644 (file)
--- a/atom/browser/mac/mac_native_converter.h
+++ b/atom/browser/mac/mac_native_converter.h
@@ -5,10 +5,7 @@
 
 @interface MacNativeConverter : NSObject
 
-- (base::ListValue*)arrayToListValue:(NSArray*)nsArray;
-- (base::DictionaryValue*)dictionaryToDictionaryValue:(NSDictionary*)nsDictionary;
-
-- (NSArray*)arrayFromListValue:(const base::ListValue&)list;
-- (NSDictionary*)dictionaryFromDictionaryValue:(const base::DictionaryValue&)dict;
+- (base::ListValue*)arrayToV8:(NSArray*)nsArray;
+- (base::DictionaryValue*)dictionaryToV8:(NSDictionary*)nsDictionary;
 
 @end

diff --git a/atom/browser/mac/mac_native_converter.mm b/atom/browser/mac/mac_native_converter.mm
index 202f3e0ee4a5b9ebd37a92c766774fb9f9f37686..63244036017836b1e1bad553a09c3f69ea4668b3 100644 (file)
--- a/atom/browser/mac/mac_native_converter.mm
+++ b/atom/browser/mac/mac_native_converter.mm
@@ -2,14 +2,14 @@
 
 @implementation MacNativeConverter
 
-- (base::ListValue*)arrayToListValue:(NSArray*)nsArray {
+- (base::ListValue*)arrayToV8:(NSArray*)nsArray {
   scoped_ptr<base::ListValue> list(new base::ListValue);
 
   for (id value in nsArray) {
     if ([value isKindOfClass:[NSArray class]]) {
-      list->Append([self arrayToListValue:value]);
+      list->Append([self arrayToV8:value]);
     } else if ([value isKindOfClass:[NSDictionary class]]) {
-      list->Append([self dictionaryToDictionaryValue:value]);
+      list->Append([self dictionaryToV8:value]);
     } else if ([value isKindOfClass:[NSString class]]) {
       list->AppendString(base::SysNSStringToUTF8(value));
     } else if ([value isKindOfClass:[NSNumber class]]) {
@@ -20,7 +20,7 @@
   return list.get();
 }
 
-- (base::DictionaryValue*)dictionaryToDictionaryValue:(NSDictionary*)nsDictionary {
+- (base::DictionaryValue*)dictionaryToV8:(NSDictionary*)nsDictionary {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
 
   NSEnumerator *it = [nsDictionary keyEnumerator];
@@ -30,9 +30,9 @@
     std::string key_str(base::SysNSStringToUTF8(key));
 
     if ([value isKindOfClass:[NSArray class]]) {
-      dict->Set(key_str, [self arrayToListValue:value]);
+      dict->Set(key_str, [self arrayToV8:value]);
     } else if ([value isKindOfClass:[NSDictionary class]]) {
-      dict->Set(key_str, [self dictionaryToDictionaryValue:value]);
+      dict->Set(key_str, [self dictionaryToV8:value]);
     } else if ([value isKindOfClass:[NSString class]]) {
       dict->SetString(key_str, base::SysNSStringToUTF8(value));
     } else if ([value isKindOfClass:[NSNumber class]]) {
@@ -43,12 +43,4 @@
   return dict.get();
 }
 
-- (NSArray*)arrayFromListValue:(const base::ListValue&)list {
-  return [[NSArray alloc] init];
-}
-
-- (NSDictionary*)dictionaryFromDictionaryValue:(const base::DictionaryValue&)dict {
-  return [[NSDictionary alloc] init];
-}
-
 @end