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

chore: bump chromium to 119.0.6045.0 (main) (#40076)

Browse source 
* chore: bump chromium in DEPS to 119.0.6045.0

* chore: update patches

* 4864948: Remove legacy-legacy

4864948

* 4907760: Remove ui/base/glib/glib_signal.h

4907760

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
electron-roller[bot] 2023-10-05 19:59:39 -04:00 • committed by GitHub
parent 83a928f6e3
commit 8f7a48879e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 472 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

17
shell/browser/notifications/linux/libnotify_notification.cc
View file

@ -8,6 +8,7 @@
#include <string>
#include "base/files/file_enumerator.h"
#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/strings/utf_string_conversions.h"
#include "shell/browser/notifications/notification_delegate.h"
@ -87,15 +88,16 @@ void LibnotifyNotification::Show(const NotificationOptions& options) {
base::UTF16ToUTF8(options.title).c_str(),
base::UTF16ToUTF8(options.msg).c_str(), nullptr);
g_signal_connect(notification_, "closed",
G_CALLBACK(OnNotificationClosedThunk), this);
signal_ = ScopedGSignal(
notification_, "closed",
base::BindRepeating(&LibnotifyNotification::OnNotificationClosed,
base::Unretained(this)));
// NB: On Unity and on any other DE using Notify-OSD, adding a notification
// action will cause the notification to display as a modal dialog box.
if (NotifierSupportsActions()) {
libnotify_loader_.notify_notification_add_action(
notification_, "default", "View", OnNotificationViewThunk, this,
nullptr);
notification_, "default", "View", OnNotificationView, this, nullptr);
}
NotifyUrgency urgency = NOTIFY_URGENCY_NORMAL;
@ -175,8 +177,11 @@ void LibnotifyNotification::OnNotificationClosed(
}
void LibnotifyNotification::OnNotificationView(NotifyNotification* notification,
char* action) {
NotificationClicked();
char* action,
gpointer user_data) {
LibnotifyNotification* that = static_cast<LibnotifyNotification*>(user_data);
DCHECK(that);
that->NotificationClicked();
}
} // namespace electron

17
shell/browser/notifications/linux/libnotify_notification.h
View file

@ -8,7 +8,7 @@
#include "base/memory/raw_ptr_exclusion.h"
#include "library_loaders/libnotify_loader.h"
#include "shell/browser/notifications/notification.h"
#include "ui/base/glib/glib_signal.h"
#include "ui/base/glib/scoped_gsignal.h"
namespace electron {
@ -25,17 +25,14 @@ class LibnotifyNotification : public Notification {
void Dismiss() override;
private:
CHROMEG_CALLBACK_0(LibnotifyNotification,
void,
OnNotificationClosed,
NotifyNotification*);
CHROMEG_CALLBACK_1(LibnotifyNotification,
void,
OnNotificationView,
NotifyNotification*,
char*);
void OnNotificationClosed(NotifyNotification* notification);
static void OnNotificationView(NotifyNotification* notification,
char* action,
gpointer user_data);
RAW_PTR_EXCLUSION NotifyNotification* notification_ = nullptr;
ScopedGSignal signal_;
};
} // namespace electron