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

Fully support converting NSDictionary to JS userInfo object

Browse source
This commit is contained in:
Cheng Zhao 2016-05-05 16:26:44 +09:00
parent 8e1d2479ac
commit 60bd60e1ed
10 changed files with 105 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/browser.h
View file

@ -7,7 +7,6 @@
#include <string>
#include <vector>
#include <map>
#include "base/macros.h"
#include "base/compiler_specific.h"
@ -95,15 +94,14 @@ class Browser : public WindowListObserver {
// Creates an activity and sets it as the one currently in use.
void SetUserActivity(const std::string& type,
const std::map<std::string, std::string>& user_info);
const base::DictionaryValue& user_info);
// Returns the type name of the current user activity.
std::string GetCurrentActivityType();
// Resumes an activity via hand-off.
bool ContinueUserActivity(
const std::string& type,
const std::map<std::string, std::string>& user_info);
bool ContinueUserActivity(const std::string& type,
const base::DictionaryValue& user_info);
// Bounce the dock icon.
enum BounceType {