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

chore: bump chromium to 117.0.5923.0 (main) (#39304)

Browse source 
* chore: bump chromium in DEPS to 117.0.5921.0

* chore: update chromium patches

* 4721409: Remove redundant ARC configuration in /components | 4721409

* 4643750: Add V8_LOW_PRIORITY_TQ for main thread | 4643750

* 4022621: Re-register status item when owner of status watcher is changed | 4022621

* chore: update V8/boringssl patches

* fixup! 4643750: Add V8_LOW_PRIORITY_TQ for main thread | 4643750

* chore: bump chromium in DEPS to 117.0.5923.0

* build [debug]: remove assert
4722125: Update enterprise content analysis buildflags usage | 4722125

* chore: manually rollback to 117.0.5921.0

* build [arc]: ARC conversion in auto_updater

* build [arc]: ARC conversion in browser/api

* build [arc]: ARC conversion in notifications/mac

* build [arc]: ARC conversion in in_app_purchase

* build [arc]: ARC conversion in browser/ui

* build [arc]: ARC conversion in ui/cocoa

* build [arc]: ARC conversion in shell/common

* build [arc]: ARC conversion in OSR

* build [arc]: ARC conversion in login_helper

* build [arc]: ARC conversion in app_mas

* build [arc]: fix up ARC syntax (thanks @codebytere!)

* 4726946: [Extensions] Work around dangling BrowserContext pointer. | 4726946

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
This commit is contained in:
electron-roller[bot] 2023-08-04 10:47:29 +02:00 • committed by GitHub
parent 6d0e8044eb
commit c5b9f766f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
73 changed files with 323 additions and 399 deletions
Download patch file Download diff file Expand all files Collapse all files

3
shell/browser/notifications/mac/cocoa_notification.h
View file

@ -10,7 +10,6 @@
#include <map>
#include <string>
#include "base/mac/scoped_nsobject.h"
#include "shell/browser/notifications/notification.h"
namespace electron {
@ -36,7 +35,7 @@ class CocoaNotification : public Notification {
private:
void LogAction(const char* action);
base::scoped_nsobject<NSUserNotification> notification_;
NSUserNotification* __strong notification_;
std::map<std::string, unsigned> additional_action_indices_;
unsigned action_index_;
};

7
shell/browser/notifications/mac/cocoa_notification.mm
View file

@ -28,7 +28,7 @@ CocoaNotification::~CocoaNotification() {
}
void CocoaNotification::Show(const NotificationOptions& options) {
notification_.reset([[NSUserNotification alloc] init]);
notification_ = [[NSUserNotification alloc] init];
NSString* identifier =
[NSString stringWithFormat:@"%@:notification:%@",
@ -71,8 +71,7 @@ void CocoaNotification::Show(const NotificationOptions& options) {
int i = 0;
action_index_ = UINT_MAX;
NSMutableArray* additionalActions =
[[[NSMutableArray alloc] init] autorelease];
NSMutableArray* additionalActions = [[NSMutableArray alloc] init];
for (const auto& action : options.actions) {
if (action.type == u"button") {
// If the notification has both a reply and actions,
@ -118,7 +117,7 @@ void CocoaNotification::Dismiss() {
NotificationDismissed();
notification_.reset(nil);
notification_ = nil;
}
void CocoaNotification::NotificationDisplayed() {

4
shell/browser/notifications/mac/notification_presenter_mac.h
View file

@ -6,7 +6,6 @@
#ifndef ELECTRON_SHELL_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_PRESENTER_MAC_H_
#define ELECTRON_SHELL_BROWSER_NOTIFICATIONS_MAC_NOTIFICATION_PRESENTER_MAC_H_
#include "base/mac/scoped_nsobject.h"
#include "shell/browser/notifications/mac/notification_center_delegate.h"
#include "shell/browser/notifications/notification_presenter.h"
@ -25,8 +24,7 @@ class NotificationPresenterMac : public NotificationPresenter {
Notification* CreateNotificationObject(
NotificationDelegate* delegate) override;
base::scoped_nsobject<NotificationCenterDelegate>
notification_center_delegate_;
NotificationCenterDelegate* __strong notification_center_delegate_;
};
} // namespace electron