
* chore: bump chromium in DEPS to 91.0.4435.3 * build: add 'use_rts' definition Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2694187 * chore: update patches * chore: media_internal_resources becomes resources Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2699022 * chore: update patches * refactor: extensions::ViewType moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 * chore: might_have_observers has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2667839 * refactor: CertVerifier is not in the network namespace anymore Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805 * refactor: ExtensionUserScriptManager is now UserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617 * refactor: content::SiteInstance::GetSiteForURL was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2680274 * refactor: MenuItemType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 * refactor: extensions::ViewType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 * refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2685601 * refactor: blink::MenuItem::Type was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 * refactor: CreateDataPipe deprecated form was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2698090 * refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2700637 * chore: wire up activation_time in OSR Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2638372 * chore: remove deleted file from chromium_src list * chore: fix lint * update patches * chore: bump chromium in DEPS to 91.0.4438.0 * chore: bump chromium in DEPS to 91.0.4439.0 * chore: bump chromium in DEPS to 91.0.4440.0 * chore: bump chromium in DEPS to 91.0.4441.0 * chore: bump chromium in DEPS to 91.0.4442.0 * chore: bump chromium in DEPS to 91.0.4443.0 * chore: bump chromium in DEPS to 91.0.4445.0 * chore: bump chromium in DEPS to 91.0.4446.0 * chore: update patches * fixup gn check * Merge branch 'master' into roller/chromium/master * update to xcode 12.4.0 Needed because of8008deb41c
* 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id. https://chromium-review.googlesource.com/c/chromium/src/+/2752932 * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 * 2734095: Introduce StoragePartitionId type to wrap current string representation. https://chromium-review.googlesource.com/c/chromium/src/+/2734095 * chore: bump chromium in DEPS to 91.0.4448.0 * Update patches * 2743594: Remove WebSize from blink. https://chromium-review.googlesource.com/c/chromium/src/+/2743594 * 2725403: Add URLLoaderClient::OnReceiveEarlyHints() https://chromium-review.googlesource.com/c/chromium/src/+/2725403 * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 * 2721718: Move HostID to extensions::mojom::HostID https://chromium-review.googlesource.com/c/chromium/src/+/2721718 * 2733070: Rename observer to URLLoaderNetworkServiceObserver https://chromium-review.googlesource.com/c/chromium/src/+/2733070 * Use nogncheck for content/browser/site_instance_impl.h This is needed because //content/browser:browser is not a visible target * 2648046: Introduce alert notification helper .app https://chromium-review.googlesource.com/c/chromium/src/+/2648046 * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * only include mac notifications on mac * add additional skipping of atk toolchain check * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * 2720306: [api] Remove deprecated [Shared]ArrayBuffer API https://chromium-review.googlesource.com/c/v8/v8/+/2720306 * Fixup 2721718: Move HostID to extensions::mojom::HostID * fixup 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer * Fixup 2752406: [LSC] Replace base::string16 with std::u16string in //ui * Fixup 2725403: Add URLLoaderClient::OnReceiveEarlyHints() * update node headers * chore: bump chromium in DEPS to 91.0.4449.0 * Revert "chore: bump chromium in DEPS to 91.0.4449.0" This reverts commitbccafa0289
. * 2693008: Fix loading non-system cursors on Windows on browser_tests https://chromium-review.googlesource.com/c/chromium/src/+/2693008 * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * undo changes to WebContentsPreferences::GetPreloadPath to fix mac build * fix StrCat issue * incantations for WebContentsPreferences::GetPreloadPath wide strings * bump nan * fix GetAsString maybe? * windows build fixes * more windows build fix * SetAppUserModelID -> wstring * upgrade nan dep in tests * lint * wstrings are cross-platform * linter * only bind setAppUserModelId on windows * fix a messed up merge * well that was an odyssey * backport fcdf35e from v8 to fix nan crash * disable typedarrays-test.js * don't defer in NSWindow creation https://chromium-review.googlesource.com/c/chromium/src/+/2707696 * use PartitionAllocator for ArrayBuffers in the main process * fix patches * chore: omit some unnecessary conversions * refactor: make LoginItemSettings::path a wstring * refactor: make ShowTaskDialog take a wstr * Revert "refactor: make LoginItemSettings::path a wstring" This reverts commit9127cff58b
. Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
307 lines
8.5 KiB
C++
307 lines
8.5 KiB
C++
// Copyright (c) 2014 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/api/electron_api_notification.h"
|
|
|
|
#include "base/guid.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "gin/handle.h"
|
|
#include "shell/browser/api/electron_api_menu.h"
|
|
#include "shell/browser/browser.h"
|
|
#include "shell/browser/electron_browser_client.h"
|
|
#include "shell/common/gin_converters/image_converter.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/gin_helper/object_template_builder.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "url/gurl.h"
|
|
|
|
namespace gin {
|
|
|
|
template <>
|
|
struct Converter<electron::NotificationAction> {
|
|
static bool FromV8(v8::Isolate* isolate,
|
|
v8::Local<v8::Value> val,
|
|
electron::NotificationAction* out) {
|
|
gin::Dictionary dict(isolate);
|
|
if (!ConvertFromV8(isolate, val, &dict))
|
|
return false;
|
|
|
|
if (!dict.Get("type", &(out->type))) {
|
|
return false;
|
|
}
|
|
dict.Get("text", &(out->text));
|
|
return true;
|
|
}
|
|
|
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
|
electron::NotificationAction val) {
|
|
gin::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
dict.Set("text", val.text);
|
|
dict.Set("type", val.type);
|
|
return ConvertToV8(isolate, dict);
|
|
}
|
|
};
|
|
|
|
} // namespace gin
|
|
|
|
namespace electron {
|
|
|
|
namespace api {
|
|
|
|
gin::WrapperInfo Notification::kWrapperInfo = {gin::kEmbedderNativeGin};
|
|
|
|
Notification::Notification(gin::Arguments* args) {
|
|
presenter_ = static_cast<ElectronBrowserClient*>(ElectronBrowserClient::Get())
|
|
->GetNotificationPresenter();
|
|
|
|
gin::Dictionary opts(nullptr);
|
|
if (args->GetNext(&opts)) {
|
|
opts.Get("title", &title_);
|
|
opts.Get("subtitle", &subtitle_);
|
|
opts.Get("body", &body_);
|
|
has_icon_ = opts.Get("icon", &icon_);
|
|
if (has_icon_) {
|
|
opts.Get("icon", &icon_path_);
|
|
}
|
|
opts.Get("silent", &silent_);
|
|
opts.Get("replyPlaceholder", &reply_placeholder_);
|
|
opts.Get("urgency", &urgency_);
|
|
opts.Get("hasReply", &has_reply_);
|
|
opts.Get("timeoutType", &timeout_type_);
|
|
opts.Get("actions", &actions_);
|
|
opts.Get("sound", &sound_);
|
|
opts.Get("closeButtonText", &close_button_text_);
|
|
opts.Get("toastXml", &toast_xml_);
|
|
}
|
|
}
|
|
|
|
Notification::~Notification() {
|
|
if (notification_)
|
|
notification_->set_delegate(nullptr);
|
|
}
|
|
|
|
// static
|
|
gin::Handle<Notification> Notification::New(gin_helper::ErrorThrower thrower,
|
|
gin::Arguments* args) {
|
|
if (!Browser::Get()->is_ready()) {
|
|
thrower.ThrowError("Cannot create Notification before app is ready");
|
|
return gin::Handle<Notification>();
|
|
}
|
|
return gin::CreateHandle(thrower.isolate(), new Notification(args));
|
|
}
|
|
|
|
// Getters
|
|
std::u16string Notification::GetTitle() const {
|
|
return title_;
|
|
}
|
|
|
|
std::u16string Notification::GetSubtitle() const {
|
|
return subtitle_;
|
|
}
|
|
|
|
std::u16string Notification::GetBody() const {
|
|
return body_;
|
|
}
|
|
|
|
bool Notification::GetSilent() const {
|
|
return silent_;
|
|
}
|
|
|
|
bool Notification::GetHasReply() const {
|
|
return has_reply_;
|
|
}
|
|
|
|
std::u16string Notification::GetTimeoutType() const {
|
|
return timeout_type_;
|
|
}
|
|
|
|
std::u16string Notification::GetReplyPlaceholder() const {
|
|
return reply_placeholder_;
|
|
}
|
|
|
|
std::u16string Notification::GetSound() const {
|
|
return sound_;
|
|
}
|
|
|
|
std::u16string Notification::GetUrgency() const {
|
|
return urgency_;
|
|
}
|
|
|
|
std::vector<electron::NotificationAction> Notification::GetActions() const {
|
|
return actions_;
|
|
}
|
|
|
|
std::u16string Notification::GetCloseButtonText() const {
|
|
return close_button_text_;
|
|
}
|
|
|
|
std::u16string Notification::GetToastXml() const {
|
|
return toast_xml_;
|
|
}
|
|
|
|
// Setters
|
|
void Notification::SetTitle(const std::u16string& new_title) {
|
|
title_ = new_title;
|
|
}
|
|
|
|
void Notification::SetSubtitle(const std::u16string& new_subtitle) {
|
|
subtitle_ = new_subtitle;
|
|
}
|
|
|
|
void Notification::SetBody(const std::u16string& new_body) {
|
|
body_ = new_body;
|
|
}
|
|
|
|
void Notification::SetSilent(bool new_silent) {
|
|
silent_ = new_silent;
|
|
}
|
|
|
|
void Notification::SetHasReply(bool new_has_reply) {
|
|
has_reply_ = new_has_reply;
|
|
}
|
|
|
|
void Notification::SetTimeoutType(const std::u16string& new_timeout_type) {
|
|
timeout_type_ = new_timeout_type;
|
|
}
|
|
|
|
void Notification::SetReplyPlaceholder(const std::u16string& new_placeholder) {
|
|
reply_placeholder_ = new_placeholder;
|
|
}
|
|
|
|
void Notification::SetSound(const std::u16string& new_sound) {
|
|
sound_ = new_sound;
|
|
}
|
|
|
|
void Notification::SetUrgency(const std::u16string& new_urgency) {
|
|
urgency_ = new_urgency;
|
|
}
|
|
|
|
void Notification::SetActions(
|
|
const std::vector<electron::NotificationAction>& actions) {
|
|
actions_ = actions;
|
|
}
|
|
|
|
void Notification::SetCloseButtonText(const std::u16string& text) {
|
|
close_button_text_ = text;
|
|
}
|
|
|
|
void Notification::SetToastXml(const std::u16string& new_toast_xml) {
|
|
toast_xml_ = new_toast_xml;
|
|
}
|
|
|
|
void Notification::NotificationAction(int index) {
|
|
Emit("action", index);
|
|
}
|
|
|
|
void Notification::NotificationClick() {
|
|
Emit("click");
|
|
}
|
|
|
|
void Notification::NotificationReplied(const std::string& reply) {
|
|
Emit("reply", reply);
|
|
}
|
|
|
|
void Notification::NotificationDisplayed() {
|
|
Emit("show");
|
|
}
|
|
|
|
void Notification::NotificationFailed(const std::string& error) {
|
|
Emit("failed", error);
|
|
}
|
|
|
|
void Notification::NotificationDestroyed() {}
|
|
|
|
void Notification::NotificationClosed() {
|
|
Emit("close");
|
|
}
|
|
|
|
void Notification::Close() {
|
|
if (notification_) {
|
|
notification_->Dismiss();
|
|
notification_->set_delegate(nullptr);
|
|
notification_.reset();
|
|
}
|
|
}
|
|
|
|
// Showing notifications
|
|
void Notification::Show() {
|
|
Close();
|
|
if (presenter_) {
|
|
notification_ = presenter_->CreateNotification(this, base::GenerateGUID());
|
|
if (notification_) {
|
|
electron::NotificationOptions options;
|
|
options.title = title_;
|
|
options.subtitle = subtitle_;
|
|
options.msg = body_;
|
|
options.icon_url = GURL();
|
|
options.icon = icon_.AsBitmap();
|
|
options.silent = silent_;
|
|
options.has_reply = has_reply_;
|
|
options.timeout_type = timeout_type_;
|
|
options.reply_placeholder = reply_placeholder_;
|
|
options.actions = actions_;
|
|
options.sound = sound_;
|
|
options.close_button_text = close_button_text_;
|
|
options.urgency = urgency_;
|
|
options.toast_xml = toast_xml_;
|
|
notification_->Show(options);
|
|
}
|
|
}
|
|
}
|
|
|
|
bool Notification::IsSupported() {
|
|
return !!static_cast<ElectronBrowserClient*>(ElectronBrowserClient::Get())
|
|
->GetNotificationPresenter();
|
|
}
|
|
|
|
v8::Local<v8::ObjectTemplate> Notification::FillObjectTemplate(
|
|
v8::Isolate* isolate,
|
|
v8::Local<v8::ObjectTemplate> templ) {
|
|
return gin::ObjectTemplateBuilder(isolate, "Notification", templ)
|
|
.SetMethod("show", &Notification::Show)
|
|
.SetMethod("close", &Notification::Close)
|
|
.SetProperty("title", &Notification::GetTitle, &Notification::SetTitle)
|
|
.SetProperty("subtitle", &Notification::GetSubtitle,
|
|
&Notification::SetSubtitle)
|
|
.SetProperty("body", &Notification::GetBody, &Notification::SetBody)
|
|
.SetProperty("silent", &Notification::GetSilent, &Notification::SetSilent)
|
|
.SetProperty("hasReply", &Notification::GetHasReply,
|
|
&Notification::SetHasReply)
|
|
.SetProperty("timeoutType", &Notification::GetTimeoutType,
|
|
&Notification::SetTimeoutType)
|
|
.SetProperty("replyPlaceholder", &Notification::GetReplyPlaceholder,
|
|
&Notification::SetReplyPlaceholder)
|
|
.SetProperty("urgency", &Notification::GetUrgency,
|
|
&Notification::SetUrgency)
|
|
.SetProperty("sound", &Notification::GetSound, &Notification::SetSound)
|
|
.SetProperty("actions", &Notification::GetActions,
|
|
&Notification::SetActions)
|
|
.SetProperty("closeButtonText", &Notification::GetCloseButtonText,
|
|
&Notification::SetCloseButtonText)
|
|
.SetProperty("toastXml", &Notification::GetToastXml,
|
|
&Notification::SetToastXml)
|
|
.Build();
|
|
}
|
|
|
|
} // namespace api
|
|
|
|
} // namespace electron
|
|
|
|
namespace {
|
|
|
|
using electron::api::Notification;
|
|
|
|
void Initialize(v8::Local<v8::Object> exports,
|
|
v8::Local<v8::Value> unused,
|
|
v8::Local<v8::Context> context,
|
|
void* priv) {
|
|
v8::Isolate* isolate = context->GetIsolate();
|
|
gin_helper::Dictionary dict(isolate, exports);
|
|
dict.Set("Notification", Notification::GetConstructor(context));
|
|
dict.SetMethod("isSupported", &Notification::IsSupported);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_notification, Initialize)
|