#include "atom/common/native_mate_converters/image_converter.h"
#include "atom/common/native_mate_converters/net_converter.h"
#include "atom/common/native_mate_converters/value_converter.h"
+#include "atom/common/native_mate_converters/string_map_converter.h"
#include "atom/common/node_includes.h"
#include "atom/common/options_switches.h"
#include "base/command_line.h"
Emit("ready");
}
+void App::OnContinueUserActivity(bool* handled, const std::string& type, const std::map<std::string, std::string>& user_info) {
+ *handled = Emit("continue-activity", type, user_info);
+}
+
void App::OnLogin(LoginHandler* login_handler) {
v8::Locker locker(isolate());
v8::HandleScope handle_scope(isolate());
#define ATOM_BROWSER_API_ATOM_API_APP_H_
#include <string>
+#include <map>
#include "atom/browser/api/event_emitter.h"
#include "atom/browser/atom_browser_client.h"
void OnWillFinishLaunching() override;
void OnFinishLaunching() override;
void OnLogin(LoginHandler* login_handler) override;
+ void OnContinueUserActivity(bool* handled, const std::string& type, const std::map<std::string, std::string>& user_info) override;
// content::ContentBrowserClient:
void AllowCertificateError(
OnActivate(has_visible_windows));
}
+#if defined(OS_MACOSX)
+bool Browser::ContinueUserActivity(const std::string& type, const std::map<std::string, std::string>& user_info) {
+ bool handled = false;
+ FOR_EACH_OBSERVER(BrowserObserver,
+ observers_,
+ OnContinueUserActivity(&handled, type, user_info));
+
+ return handled;
+}
+#endif
+
void Browser::WillFinishLaunching() {
FOR_EACH_OBSERVER(BrowserObserver, observers_, OnWillFinishLaunching());
}
// 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);
+ // Resumes an activity via hand-off.
+ bool ContinueUserActivity(const std::string& type, const std::map<std::string, std::string>& user_info);
+
// Bounce the dock icon.
enum BounceType {
BOUNCE_CRITICAL = 0,
#define ATOM_BROWSER_BROWSER_OBSERVER_H_
#include <string>
+#include <map>
namespace atom {
// The browser requests HTTP login.
virtual void OnLogin(LoginHandler* login_handler) {}
+ // The browser wants to resume a user activity via handoff. (OS X only)
+ virtual void OnContinueUserActivity(bool* handled,
+ const std::string& type,
+ const std::map<std::string, std::string>& user_info) {}
+
protected:
virtual ~BrowserObserver() {}
};