mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04: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>
159 lines
5.4 KiB
Plaintext
159 lines
5.4 KiB
Plaintext
// Copyright (c) 2013 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/ui/message_box.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#import <Cocoa/Cocoa.h>
|
|
|
|
#include "base/callback.h"
|
|
#include "base/mac/mac_util.h"
|
|
#include "base/mac/scoped_nsobject.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "skia/ext/skia_utils_mac.h"
|
|
#include "ui/gfx/image/image_skia.h"
|
|
|
|
namespace electron {
|
|
|
|
MessageBoxSettings::MessageBoxSettings() = default;
|
|
MessageBoxSettings::MessageBoxSettings(const MessageBoxSettings&) = default;
|
|
MessageBoxSettings::~MessageBoxSettings() = default;
|
|
|
|
namespace {
|
|
|
|
NSAlert* CreateNSAlert(const MessageBoxSettings& settings) {
|
|
// Ignore the title; it's the window title on other platforms and ignorable.
|
|
NSAlert* alert = [[NSAlert alloc] init];
|
|
[alert setMessageText:base::SysUTF8ToNSString(settings.message)];
|
|
[alert setInformativeText:base::SysUTF8ToNSString(settings.detail)];
|
|
|
|
switch (settings.type) {
|
|
case MessageBoxType::kInformation:
|
|
alert.alertStyle = NSInformationalAlertStyle;
|
|
break;
|
|
case MessageBoxType::kWarning:
|
|
case MessageBoxType::kError:
|
|
// NSWarningAlertStyle shows the app icon while NSCriticalAlertStyle
|
|
// shows a warning icon with an app icon badge. Since there is no
|
|
// error variant, lets just use NSCriticalAlertStyle.
|
|
alert.alertStyle = NSCriticalAlertStyle;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
for (size_t i = 0; i < settings.buttons.size(); ++i) {
|
|
NSString* title = base::SysUTF8ToNSString(settings.buttons[i]);
|
|
// An empty title causes crash on macOS.
|
|
if (settings.buttons[i].empty())
|
|
title = @"(empty)";
|
|
NSButton* button = [alert addButtonWithTitle:title];
|
|
[button setTag:i];
|
|
}
|
|
|
|
NSArray* ns_buttons = [alert buttons];
|
|
int button_count = static_cast<int>([ns_buttons count]);
|
|
|
|
if (settings.default_id >= 0 && settings.default_id < button_count) {
|
|
// Highlight the button at default_id
|
|
[[ns_buttons objectAtIndex:settings.default_id] highlight:YES];
|
|
|
|
// The first button added gets set as the default selected, so remove
|
|
// that and set the button @ default_id to be default.
|
|
[[ns_buttons objectAtIndex:0] setKeyEquivalent:@""];
|
|
[[ns_buttons objectAtIndex:settings.default_id] setKeyEquivalent:@"\r"];
|
|
}
|
|
|
|
// Bind cancel id button to escape key if there is more than one button
|
|
if (button_count > 1 && settings.cancel_id >= 0 &&
|
|
settings.cancel_id < button_count) {
|
|
[[ns_buttons objectAtIndex:settings.cancel_id] setKeyEquivalent:@"\e"];
|
|
}
|
|
|
|
if (!settings.checkbox_label.empty()) {
|
|
alert.showsSuppressionButton = YES;
|
|
alert.suppressionButton.title =
|
|
base::SysUTF8ToNSString(settings.checkbox_label);
|
|
alert.suppressionButton.state =
|
|
settings.checkbox_checked ? NSOnState : NSOffState;
|
|
}
|
|
|
|
if (!settings.icon.isNull()) {
|
|
NSImage* image = skia::SkBitmapToNSImageWithColorSpace(
|
|
*settings.icon.bitmap(), base::mac::GetGenericRGBColorSpace());
|
|
[alert setIcon:image];
|
|
}
|
|
|
|
return alert;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
int ShowMessageBoxSync(const MessageBoxSettings& settings) {
|
|
base::scoped_nsobject<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
|
|
// shown as it would be impossible to dismiss the alert if it is connected
|
|
// to invisible window (see #22671).
|
|
if (!settings.parent_window || !settings.parent_window->IsVisible())
|
|
return [alert runModal];
|
|
|
|
__block int ret_code = -1;
|
|
|
|
NSWindow* window =
|
|
settings.parent_window->GetNativeWindow().GetNativeNSWindow();
|
|
[alert beginSheetModalForWindow:window
|
|
completionHandler:^(NSModalResponse response) {
|
|
ret_code = response;
|
|
[NSApp stopModal];
|
|
}];
|
|
|
|
[NSApp runModalForWindow:window];
|
|
return ret_code;
|
|
}
|
|
|
|
void ShowMessageBox(const MessageBoxSettings& settings,
|
|
MessageBoxCallback callback) {
|
|
NSAlert* alert = CreateNSAlert(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];
|
|
std::move(callback).Run(ret, alert.suppressionButton.state == NSOnState);
|
|
} else {
|
|
NSWindow* window =
|
|
settings.parent_window
|
|
? settings.parent_window->GetNativeWindow().GetNativeNSWindow()
|
|
: nil;
|
|
|
|
// Duplicate the callback object here since c is a reference and gcd would
|
|
// only store the pointer, by duplication we can force gcd to store a copy.
|
|
__block MessageBoxCallback callback_ = std::move(callback);
|
|
|
|
[alert beginSheetModalForWindow:window
|
|
completionHandler:^(NSModalResponse response) {
|
|
std::move(callback_).Run(
|
|
response, alert.suppressionButton.state == NSOnState);
|
|
[alert release];
|
|
}];
|
|
}
|
|
}
|
|
|
|
void ShowErrorBox(const std::u16string& title, const std::u16string& content) {
|
|
NSAlert* alert = [[NSAlert alloc] init];
|
|
[alert setMessageText:base::SysUTF16ToNSString(title)];
|
|
[alert setInformativeText:base::SysUTF16ToNSString(content)];
|
|
[alert setAlertStyle:NSCriticalAlertStyle];
|
|
[alert runModal];
|
|
[alert release];
|
|
}
|
|
|
|
} // namespace electron
|