mirror of
https://github.com/electron/electron.git
synced 2026-02-26 03:01:17 -05:00
* chore: bump chromium in DEPS to 90.0.4430.19 * build: add 'use_rts' definition Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2694187 (cherry picked from commitb820b4078d) * chore: bump chromium in DEPS to 91.0.4441.0 * chore: update patches (cherry picked from commit55e50a0879) * chore: media_internal_resources becomes resources Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2699022 (cherry picked from commite715b9c921) * chore: update patches (cherry picked from commitc8148febfa) * refactor: extensions::ViewType moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 (cherry picked from commit87df2766ba) * chore: might_have_observers has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2667839 (cherry picked from commite900271bea) * refactor: CertVerifier is not in the network namespace anymore Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805 (cherry picked from commiteccfa516c5) * refactor: ExtensionUserScriptManager is now UserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617 (cherry picked from commit2fed02556d) * refactor: content::SiteInstance::GetSiteForURL was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2680274 (cherry picked from commit0d94e0d1d9) * refactor: MenuItemType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 (cherry picked from commit1a296e59c2) * refactor: extensions::ViewType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 (cherry picked from commitdc36e8e6fc) * refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2685601 (cherry picked from commit59669e99cb) * refactor: blink::MenuItem::Type was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 (cherry picked from commitbe627568b2) * refactor: CreateDataPipe deprecated form was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2698090 (cherry picked from commit77ad17b383) * refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2700637 (cherry picked from commit4e02d9407a) * chore: wire up activation_time in OSR Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2638372 (cherry picked from commitf51f427646) * chore: remove deleted file from chromium_src list (cherry picked from commit59432fe30a) * chore: fix lint (cherry picked from commit54cc68dd7a) * update patches (cherry picked from commite99e6a5a8a) * chore: update patches (cherry picked from commit1e16606524) * fixup gn check (cherry picked from commit8f4e362d8f) * update to xcode 12.4.0 Needed because of8008deb41c(cherry picked from commitfae4d87a5a) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commitd4bec23bde) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commit9e336f5d0c) * 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id. https://chromium-review.googlesource.com/c/chromium/src/+/2752932 (cherry picked from commit08036802cb) * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 (cherry picked from commit676f74f3dc) * 2734095: Introduce StoragePartitionId type to wrap current string representation. https://chromium-review.googlesource.com/c/chromium/src/+/2734095 (cherry picked from commit76538d2d38) * chore: bump chromium in DEPS to 90.0.4430.19 * chore: bump chromium in DEPS to 90.0.4430.30 * chore: bump chromium in DEPS to 90.0.4430.40 * chore: bump chromium in DEPS to 90.0.4430.51 * chore: bump chromium in DEPS to 91.0.4446.0 * chore: bump chromium in DEPS to 91.0.4448.0 (cherry picked from commit003dd6c16c) * Update patches (cherry picked from commit9f5e3f6685) * 2743594: Remove WebSize from blink. https://chromium-review.googlesource.com/c/chromium/src/+/2743594 (cherry picked from commitb15b820bca) * 2725403: Add URLLoaderClient::OnReceiveEarlyHints() https://chromium-review.googlesource.com/c/chromium/src/+/2725403 (cherry picked from commit185c343b22) * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 (cherry picked from commit88bbe2a352) * 2721718: Move HostID to extensions::mojom::HostID https://chromium-review.googlesource.com/c/chromium/src/+/2721718 (cherry picked from commit3010dd93e3) * 2733070: Rename observer to URLLoaderNetworkServiceObserver https://chromium-review.googlesource.com/c/chromium/src/+/2733070 (cherry picked from commitd54bee03d0) * Use nogncheck for content/browser/site_instance_impl.h This is needed because //content/browser:browser is not a visible target (cherry picked from commit5fc298ee5f) * 2648046: Introduce alert notification helper .app https://chromium-review.googlesource.com/c/chromium/src/+/2648046 (cherry picked from commit2cd53eb46a) * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 (cherry picked from commitf1bb6be4b9) * only include mac notifications on mac (cherry picked from commit3160e608e2) * add additional skipping of atk toolchain check (cherry picked from commit86d23cee40) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit22d8f22cfb) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commitec893f8322) * 2720306: [api] Remove deprecated [Shared]ArrayBuffer API https://chromium-review.googlesource.com/c/v8/v8/+/2720306 (cherry picked from commitd0989802bd) * Fixup 2721718: Move HostID to extensions::mojom::HostID (cherry picked from commit29dfabadfd) * fixup 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer (cherry picked from commit97b6868e9c) * Fixup 2752406: [LSC] Replace base::string16 with std::u16string in //ui (cherry picked from commitb6d2ae0455) * Fixup 2725403: Add URLLoaderClient::OnReceiveEarlyHints() (cherry picked from commit7e961d8a37) * update node headers (cherry picked from commitc49bc282d5) * 2693008: Fix loading non-system cursors on Windows on browser_tests https://chromium-review.googlesource.com/c/chromium/src/+/2693008 (cherry picked from commit3b183854ff) * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 (cherry picked from commit2d3c65beca) * undo changes to WebContentsPreferences::GetPreloadPath to fix mac build (cherry picked from commitdeeb2de14b) * fix StrCat issue (cherry picked from commit451e0931bf) * incantations for WebContentsPreferences::GetPreloadPath wide strings (cherry picked from commit205f572181) * bump nan (cherry picked from commit74318705c2) * fix GetAsString maybe? (cherry picked from commitea62ecd188) * windows build fixes (cherry picked from commit5b598037bb) * more windows build fix (cherry picked from commit61cf1abd4d) * SetAppUserModelID -> wstring (cherry picked from commit83d93bcbdc) * upgrade nan dep in tests (cherry picked from commit4f97b9303c) * update patch * wstrings are cross-platform (cherry picked from commit7f7b1f6c8a) * linter (cherry picked from commitaaf03765ed) * only bind setAppUserModelId on windows (cherry picked from commit640a145112) * well that was an odyssey (cherry picked from commitdd975328a0) * backport fcdf35e from v8 to fix nan crash (cherry picked from commit606fd87d1e) * disable typedarrays-test.js (cherry picked from commit01ca00ec82) * don't defer in NSWindow creation https://chromium-review.googlesource.com/c/chromium/src/+/2707696 (cherry picked from commit3122820e58) * use PartitionAllocator for ArrayBuffers in the main process (cherry picked from commit1f575ca3af) * fix patches (cherry picked from commit54e72fa8e3) * chore: omit some unnecessary conversions (cherry picked from commit0f3620099a) * refactor: make LoginItemSettings::path a wstring (cherry picked from commit9127cff58b) * refactor: make ShowTaskDialog take a wstr (cherry picked from commit1594c54933) * Revert "refactor: make LoginItemSettings::path a wstring" This reverts commit9127cff58b. (cherry picked from commit9684d85101) * fixup patches This reverts commit0cc08813a6. * update patches after merge 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: Charles Kerr <charles@charleskerr.com>
308 lines
8.5 KiB
C++
308 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)
|