github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-05-02 03:00:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

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 | https://chromium-review.googlesource.com/c/chromium/src/+/4721409

* 4643750: Add V8_LOW_PRIORITY_TQ for main thread | https://chromium-review.googlesource.com/c/chromium/src/+/4643750

* 4022621: Re-register status item when owner of status watcher is changed | https://chromium-review.googlesource.com/c/chromium/src/+/4022621

* chore: update V8/boringssl patches

* fixup! 4643750: Add V8_LOW_PRIORITY_TQ for main thread | https://chromium-review.googlesource.com/c/chromium/src/+/4643750

* chore: bump chromium in DEPS to 117.0.5923.0

* build [debug]: remove assert
4722125: Update enterprise content analysis buildflags usage | https://chromium-review.googlesource.com/c/chromium/src/+/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. | https://chromium-review.googlesource.com/c/chromium/src/+/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
73 changed files with 323 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
shell/browser/ui/message_box_mac.mm
View File

@@ -14,7 +14,6 @@
#include "base/containers/contains.h"
#include "base/functional/callback.h"
#include "base/mac/mac_util.h"
#include "base/mac/scoped_nsobject.h"
#include "base/no_destructor.h"
#include "base/strings/sys_string_conversions.h"
#include "content/public/browser/browser_task_traits.h"
@@ -106,7 +105,7 @@ NSAlert* CreateNSAlert(const MessageBoxSettings& settings) {
if (settings.text_width > 0) {
NSRect rect = NSMakeRect(0, 0, settings.text_width, 0);
NSView* accessoryView = [[NSView alloc] initWithFrame:rect];
[alert setAccessoryView:[accessoryView autorelease]];
[alert setAccessoryView:accessoryView];
}
return alert;
@@ -115,7 +114,7 @@ NSAlert* CreateNSAlert(const MessageBoxSettings& settings) {
} // namespace
int ShowMessageBoxSync(const MessageBoxSettings& settings) {
base::scoped_nsobject<NSAlert> alert(CreateNSAlert(settings));
NSAlert* alert(CreateNSAlert(settings));
// Use runModal for synchronous alert without parent, since we don't have a
// window to wait for. Also use it when window is provided but it is not
@@ -145,7 +144,7 @@ void ShowMessageBox(const MessageBoxSettings& settings,
// Use runModal for synchronous alert without parent, since we don't have a
// window to wait for.
if (!settings.parent_window) {
int ret = [[alert autorelease] runModal];
int ret = [alert runModal];
std::move(callback).Run(
ret, alert.suppressionButton.state == NSControlStateValueOn);
} else {
@@ -175,7 +174,6 @@ void ShowMessageBox(const MessageBoxSettings& settings,
if (response < 0)
response = cancel_id;
bool suppressed = alert.suppressionButton.state == NSControlStateValueOn;
[alert release];
// The completionHandler runs inside a transaction commit, and we should
// not do any runModal inside it. However since we can not control what
// users will run in the callback, we have to delay running the callback
@@ -204,7 +202,6 @@ void ShowErrorBox(const std::u16string& title, const std::u16string& content) {
[alert setInformativeText:base::SysUTF16ToNSString(content)];
[alert setAlertStyle:NSAlertStyleCritical];
[alert runModal];
[alert release];
}
} // namespace electron