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>
231 lines
7.7 KiB
C++
231 lines
7.7 KiB
C++
// 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 <windows.h> // windows.h must be included first
|
|
|
|
#include <commctrl.h>
|
|
|
|
#include <map>
|
|
#include <vector>
|
|
|
|
#include "base/strings/string_util.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "base/task/post_task.h"
|
|
#include "base/win/scoped_gdi_object.h"
|
|
#include "shell/browser/browser.h"
|
|
#include "shell/browser/native_window_views.h"
|
|
#include "shell/browser/ui/win/dialog_thread.h"
|
|
#include "shell/browser/unresponsive_suppressor.h"
|
|
#include "ui/gfx/icon_util.h"
|
|
#include "ui/gfx/image/image_skia.h"
|
|
|
|
namespace electron {
|
|
|
|
MessageBoxSettings::MessageBoxSettings() = default;
|
|
MessageBoxSettings::MessageBoxSettings(const MessageBoxSettings&) = default;
|
|
MessageBoxSettings::~MessageBoxSettings() = default;
|
|
|
|
namespace {
|
|
|
|
// Small command ID values are already taken by Windows, we have to start from
|
|
// a large number to avoid conflicts with Windows.
|
|
const int kIDStart = 100;
|
|
|
|
// Get the common ID from button's name.
|
|
struct CommonButtonID {
|
|
int button;
|
|
int id;
|
|
};
|
|
CommonButtonID GetCommonID(const std::wstring& button) {
|
|
std::wstring lower = base::ToLowerASCII(button);
|
|
if (lower == L"ok")
|
|
return {TDCBF_OK_BUTTON, IDOK};
|
|
else if (lower == L"yes")
|
|
return {TDCBF_YES_BUTTON, IDYES};
|
|
else if (lower == L"no")
|
|
return {TDCBF_NO_BUTTON, IDNO};
|
|
else if (lower == L"cancel")
|
|
return {TDCBF_CANCEL_BUTTON, IDCANCEL};
|
|
else if (lower == L"retry")
|
|
return {TDCBF_RETRY_BUTTON, IDRETRY};
|
|
else if (lower == L"close")
|
|
return {TDCBF_CLOSE_BUTTON, IDCLOSE};
|
|
return {-1, -1};
|
|
}
|
|
|
|
// Determine whether the buttons are common buttons, if so map common ID
|
|
// to button ID.
|
|
void MapToCommonID(const std::vector<std::wstring>& buttons,
|
|
std::map<int, int>* id_map,
|
|
TASKDIALOG_COMMON_BUTTON_FLAGS* button_flags,
|
|
std::vector<TASKDIALOG_BUTTON>* dialog_buttons) {
|
|
for (size_t i = 0; i < buttons.size(); ++i) {
|
|
auto common = GetCommonID(buttons[i]);
|
|
if (common.button != -1) {
|
|
// It is a common button.
|
|
(*id_map)[common.id] = i;
|
|
(*button_flags) |= common.button;
|
|
} else {
|
|
// It is a custom button.
|
|
dialog_buttons->push_back(
|
|
{static_cast<int>(i + kIDStart), buttons[i].c_str()});
|
|
}
|
|
}
|
|
}
|
|
|
|
DialogResult ShowTaskDialogWstr(NativeWindow* parent,
|
|
MessageBoxType type,
|
|
const std::vector<std::wstring>& buttons,
|
|
int default_id,
|
|
int cancel_id,
|
|
bool no_link,
|
|
const std::wstring& title,
|
|
const std::wstring& message,
|
|
const std::wstring& detail,
|
|
const std::wstring& checkbox_label,
|
|
bool checkbox_checked,
|
|
const gfx::ImageSkia& icon) {
|
|
TASKDIALOG_FLAGS flags =
|
|
TDF_SIZE_TO_CONTENT | // Show all content.
|
|
TDF_ALLOW_DIALOG_CANCELLATION; // Allow canceling the dialog.
|
|
|
|
TASKDIALOGCONFIG config = {0};
|
|
config.cbSize = sizeof(config);
|
|
config.hInstance = GetModuleHandle(NULL);
|
|
config.dwFlags = flags;
|
|
|
|
if (parent) {
|
|
config.hwndParent = static_cast<electron::NativeWindowViews*>(parent)
|
|
->GetAcceleratedWidget();
|
|
}
|
|
|
|
if (default_id > 0)
|
|
config.nDefaultButton = kIDStart + default_id;
|
|
|
|
// TaskDialogIndirect doesn't allow empty name, if we set empty title it
|
|
// will show "electron.exe" in title.
|
|
if (title.empty()) {
|
|
std::wstring app_name = base::UTF8ToWide(Browser::Get()->GetName());
|
|
config.pszWindowTitle = app_name.c_str();
|
|
} else {
|
|
config.pszWindowTitle = title.c_str();
|
|
}
|
|
|
|
base::win::ScopedHICON hicon;
|
|
if (!icon.isNull()) {
|
|
hicon = IconUtil::CreateHICONFromSkBitmap(*icon.bitmap());
|
|
config.dwFlags |= TDF_USE_HICON_MAIN;
|
|
config.hMainIcon = hicon.get();
|
|
} else {
|
|
// Show icon according to dialog's type.
|
|
switch (type) {
|
|
case MessageBoxType::kInformation:
|
|
case MessageBoxType::kQuestion:
|
|
config.pszMainIcon = TD_INFORMATION_ICON;
|
|
break;
|
|
case MessageBoxType::kWarning:
|
|
config.pszMainIcon = TD_WARNING_ICON;
|
|
break;
|
|
case MessageBoxType::kError:
|
|
config.pszMainIcon = TD_ERROR_ICON;
|
|
break;
|
|
case MessageBoxType::kNone:
|
|
break;
|
|
}
|
|
}
|
|
|
|
// If "detail" is empty then don't make message highlighted.
|
|
if (detail.empty()) {
|
|
config.pszContent = message.c_str();
|
|
} else {
|
|
config.pszMainInstruction = message.c_str();
|
|
config.pszContent = detail.c_str();
|
|
}
|
|
|
|
if (!checkbox_label.empty()) {
|
|
config.pszVerificationText = checkbox_label.c_str();
|
|
if (checkbox_checked)
|
|
config.dwFlags |= TDF_VERIFICATION_FLAG_CHECKED;
|
|
}
|
|
|
|
// Iterate through the buttons, put common buttons in dwCommonButtons
|
|
// and custom buttons in pButtons.
|
|
std::map<int, int> id_map;
|
|
std::vector<TASKDIALOG_BUTTON> dialog_buttons;
|
|
if (no_link) {
|
|
for (size_t i = 0; i < buttons.size(); ++i)
|
|
dialog_buttons.push_back(
|
|
{static_cast<int>(i + kIDStart), buttons[i].c_str()});
|
|
} else {
|
|
MapToCommonID(buttons, &id_map, &config.dwCommonButtons, &dialog_buttons);
|
|
}
|
|
if (!dialog_buttons.empty()) {
|
|
config.pButtons = &dialog_buttons.front();
|
|
config.cButtons = dialog_buttons.size();
|
|
if (!no_link)
|
|
config.dwFlags |= TDF_USE_COMMAND_LINKS; // custom buttons as links.
|
|
}
|
|
|
|
int button_id;
|
|
|
|
int id = 0;
|
|
BOOL verificationFlagChecked = FALSE;
|
|
TaskDialogIndirect(&config, &id, nullptr, &verificationFlagChecked);
|
|
|
|
if (id_map.find(id) != id_map.end()) // common button.
|
|
button_id = id_map[id];
|
|
else if (id >= kIDStart) // custom button.
|
|
button_id = id - kIDStart;
|
|
else
|
|
button_id = cancel_id;
|
|
|
|
return std::make_pair(button_id, verificationFlagChecked);
|
|
}
|
|
|
|
DialogResult ShowTaskDialogUTF8(const MessageBoxSettings& settings) {
|
|
std::vector<std::wstring> buttons;
|
|
for (const auto& button : settings.buttons)
|
|
buttons.push_back(base::UTF8ToWide(button));
|
|
|
|
const std::wstring title = base::UTF8ToWide(settings.title);
|
|
const std::wstring message = base::UTF8ToWide(settings.message);
|
|
const std::wstring detail = base::UTF8ToWide(settings.detail);
|
|
const std::wstring checkbox_label = base::UTF8ToWide(settings.checkbox_label);
|
|
|
|
return ShowTaskDialogWstr(
|
|
settings.parent_window, settings.type, buttons, settings.default_id,
|
|
settings.cancel_id, settings.no_link, title, message, detail,
|
|
checkbox_label, settings.checkbox_checked, settings.icon);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
int ShowMessageBoxSync(const MessageBoxSettings& settings) {
|
|
electron::UnresponsiveSuppressor suppressor;
|
|
DialogResult result = ShowTaskDialogUTF8(settings);
|
|
return result.first;
|
|
}
|
|
|
|
void ShowMessageBox(const MessageBoxSettings& settings,
|
|
MessageBoxCallback callback) {
|
|
dialog_thread::Run(base::BindOnce(&ShowTaskDialogUTF8, settings),
|
|
base::BindOnce(
|
|
[](MessageBoxCallback callback, DialogResult result) {
|
|
std::move(callback).Run(result.first, result.second);
|
|
},
|
|
std::move(callback)));
|
|
}
|
|
|
|
void ShowErrorBox(const std::u16string& title, const std::u16string& content) {
|
|
electron::UnresponsiveSuppressor suppressor;
|
|
ShowTaskDialogWstr(nullptr, MessageBoxType::kError, {}, -1, 0, false,
|
|
base::UTF8ToWide("Error"), base::UTF16ToWide(title),
|
|
base::UTF16ToWide(content), base::UTF8ToWide(""), false,
|
|
gfx::ImageSkia());
|
|
}
|
|
|
|
} // namespace electron
|