a006cf681b
* chore: bump chromium in DEPS to 91.0.4435.3 * build: add 'use_rts' definition Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2694187 * chore: update patches * chore: media_internal_resources becomes resources Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2699022 * chore: update patches * refactor: extensions::ViewType moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 * chore: might_have_observers has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2667839 * refactor: CertVerifier is not in the network namespace anymore Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805 * refactor: ExtensionUserScriptManager is now UserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617 * refactor: content::SiteInstance::GetSiteForURL was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2680274 * refactor: MenuItemType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 * refactor: extensions::ViewType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 * refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2685601 * refactor: blink::MenuItem::Type was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 * refactor: CreateDataPipe deprecated form was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2698090 * refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2700637 * chore: wire up activation_time in OSR Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2638372 * chore: remove deleted file from chromium_src list * chore: fix lint * update patches * chore: bump chromium in DEPS to 91.0.4438.0 * chore: bump chromium in DEPS to 91.0.4439.0 * chore: bump chromium in DEPS to 91.0.4440.0 * chore: bump chromium in DEPS to 91.0.4441.0 * chore: bump chromium in DEPS to 91.0.4442.0 * chore: bump chromium in DEPS to 91.0.4443.0 * chore: bump chromium in DEPS to 91.0.4445.0 * chore: bump chromium in DEPS to 91.0.4446.0 * chore: update patches * fixup gn check * Merge branch 'master' into roller/chromium/master * update to xcode 12.4.0 Needed because of8008deb41c
* 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id. https://chromium-review.googlesource.com/c/chromium/src/+/2752932 * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 * 2734095: Introduce StoragePartitionId type to wrap current string representation. https://chromium-review.googlesource.com/c/chromium/src/+/2734095 * chore: bump chromium in DEPS to 91.0.4448.0 * Update patches * 2743594: Remove WebSize from blink. https://chromium-review.googlesource.com/c/chromium/src/+/2743594 * 2725403: Add URLLoaderClient::OnReceiveEarlyHints() https://chromium-review.googlesource.com/c/chromium/src/+/2725403 * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 * 2721718: Move HostID to extensions::mojom::HostID https://chromium-review.googlesource.com/c/chromium/src/+/2721718 * 2733070: Rename observer to URLLoaderNetworkServiceObserver https://chromium-review.googlesource.com/c/chromium/src/+/2733070 * Use nogncheck for content/browser/site_instance_impl.h This is needed because //content/browser:browser is not a visible target * 2648046: Introduce alert notification helper .app https://chromium-review.googlesource.com/c/chromium/src/+/2648046 * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * only include mac notifications on mac * add additional skipping of atk toolchain check * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * 2720306: [api] Remove deprecated [Shared]ArrayBuffer API https://chromium-review.googlesource.com/c/v8/v8/+/2720306 * Fixup 2721718: Move HostID to extensions::mojom::HostID * fixup 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer * Fixup 2752406: [LSC] Replace base::string16 with std::u16string in //ui * Fixup 2725403: Add URLLoaderClient::OnReceiveEarlyHints() * update node headers * chore: bump chromium in DEPS to 91.0.4449.0 * Revert "chore: bump chromium in DEPS to 91.0.4449.0" This reverts commitbccafa0289
. * 2693008: Fix loading non-system cursors on Windows on browser_tests https://chromium-review.googlesource.com/c/chromium/src/+/2693008 * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * undo changes to WebContentsPreferences::GetPreloadPath to fix mac build * fix StrCat issue * incantations for WebContentsPreferences::GetPreloadPath wide strings * bump nan * fix GetAsString maybe? * windows build fixes * more windows build fix * SetAppUserModelID -> wstring * upgrade nan dep in tests * lint * wstrings are cross-platform * linter * only bind setAppUserModelId on windows * fix a messed up merge * well that was an odyssey * backport fcdf35e from v8 to fix nan crash * disable typedarrays-test.js * don't defer in NSWindow creation https://chromium-review.googlesource.com/c/chromium/src/+/2707696 * use PartitionAllocator for ArrayBuffers in the main process * fix patches * chore: omit some unnecessary conversions * refactor: make LoginItemSettings::path a wstring * refactor: make ShowTaskDialog take a wstr * Revert "refactor: make LoginItemSettings::path a wstring" This reverts commit9127cff58b
. 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: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
137 lines
4.2 KiB
C++
137 lines
4.2 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/electron_javascript_dialog_manager.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/bind.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "shell/browser/api/electron_api_web_contents.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "shell/browser/ui/message_box.h"
|
|
#include "shell/browser/web_contents_preferences.h"
|
|
#include "shell/common/options_switches.h"
|
|
#include "ui/gfx/image/image_skia.h"
|
|
|
|
using content::JavaScriptDialogType;
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
constexpr int kUserWantsNoMoreDialogs = -1;
|
|
|
|
} // namespace
|
|
|
|
ElectronJavaScriptDialogManager::ElectronJavaScriptDialogManager() {}
|
|
ElectronJavaScriptDialogManager::~ElectronJavaScriptDialogManager() = default;
|
|
|
|
void ElectronJavaScriptDialogManager::RunJavaScriptDialog(
|
|
content::WebContents* web_contents,
|
|
content::RenderFrameHost* rfh,
|
|
JavaScriptDialogType dialog_type,
|
|
const std::u16string& message_text,
|
|
const std::u16string& default_prompt_text,
|
|
DialogClosedCallback callback,
|
|
bool* did_suppress_message) {
|
|
auto origin_url = rfh->GetLastCommittedURL();
|
|
|
|
std::string origin;
|
|
// For file:// URLs we do the alert filtering by the
|
|
// file path currently loaded
|
|
if (origin_url.SchemeIsFile()) {
|
|
origin = origin_url.path();
|
|
} else {
|
|
origin = origin_url.GetOrigin().spec();
|
|
}
|
|
|
|
if (origin_counts_[origin] == kUserWantsNoMoreDialogs) {
|
|
return std::move(callback).Run(false, std::u16string());
|
|
}
|
|
|
|
if (dialog_type != JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_ALERT &&
|
|
dialog_type != JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_CONFIRM) {
|
|
std::move(callback).Run(false, std::u16string());
|
|
return;
|
|
}
|
|
|
|
auto* web_preferences = WebContentsPreferences::From(web_contents);
|
|
|
|
if (web_preferences && web_preferences->IsEnabled("disableDialogs")) {
|
|
return std::move(callback).Run(false, std::u16string());
|
|
}
|
|
|
|
// No default button
|
|
int default_id = -1;
|
|
int cancel_id = 0;
|
|
|
|
std::vector<std::string> buttons = {"OK"};
|
|
if (dialog_type == JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_CONFIRM) {
|
|
buttons.emplace_back("Cancel");
|
|
// First button is default, second button is cancel
|
|
default_id = 0;
|
|
cancel_id = 1;
|
|
}
|
|
|
|
origin_counts_[origin]++;
|
|
|
|
std::string checkbox;
|
|
if (origin_counts_[origin] > 1 && web_preferences &&
|
|
web_preferences->IsEnabled("safeDialogs") &&
|
|
!web_preferences->GetPreference("safeDialogsMessage", &checkbox)) {
|
|
checkbox = "Prevent this app from creating additional dialogs";
|
|
}
|
|
|
|
// Don't set parent for offscreen window.
|
|
NativeWindow* window = nullptr;
|
|
if (web_preferences && !web_preferences->IsEnabled(options::kOffscreen)) {
|
|
auto* relay = NativeWindowRelay::FromWebContents(web_contents);
|
|
if (relay)
|
|
window = relay->GetNativeWindow();
|
|
}
|
|
|
|
electron::MessageBoxSettings settings;
|
|
settings.parent_window = window;
|
|
settings.checkbox_label = checkbox;
|
|
settings.buttons = buttons;
|
|
settings.default_id = default_id;
|
|
settings.cancel_id = cancel_id;
|
|
settings.message = base::UTF16ToUTF8(message_text);
|
|
|
|
electron::ShowMessageBox(
|
|
settings,
|
|
base::BindOnce(&ElectronJavaScriptDialogManager::OnMessageBoxCallback,
|
|
base::Unretained(this), std::move(callback), origin));
|
|
}
|
|
|
|
void ElectronJavaScriptDialogManager::RunBeforeUnloadDialog(
|
|
content::WebContents* web_contents,
|
|
content::RenderFrameHost* rfh,
|
|
bool is_reload,
|
|
DialogClosedCallback callback) {
|
|
auto* api_web_contents = api::WebContents::From(web_contents);
|
|
if (api_web_contents) {
|
|
bool default_prevented = api_web_contents->Emit("will-prevent-unload");
|
|
std::move(callback).Run(default_prevented, std::u16string());
|
|
}
|
|
}
|
|
|
|
void ElectronJavaScriptDialogManager::CancelDialogs(
|
|
content::WebContents* web_contents,
|
|
bool reset_state) {}
|
|
|
|
void ElectronJavaScriptDialogManager::OnMessageBoxCallback(
|
|
DialogClosedCallback callback,
|
|
const std::string& origin,
|
|
int code,
|
|
bool checkbox_checked) {
|
|
if (checkbox_checked)
|
|
origin_counts_[origin] = kUserWantsNoMoreDialogs;
|
|
std::move(callback).Run(code == 0, std::u16string());
|
|
}
|
|
|
|
} // namespace electron
|