From 46841d7373dcdc54cffbd65b6bdbdcced3306687 Mon Sep 17 00:00:00 2001 From: "trop[bot]" Date: Wed, 27 Mar 2019 15:30:21 -0700 Subject: [PATCH] fix: set default_id and cancel_id correctly on confirm dialogs (#17578) --- atom/browser/atom_javascript_dialog_manager.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/atom/browser/atom_javascript_dialog_manager.cc b/atom/browser/atom_javascript_dialog_manager.cc index fbfc103507d9d..8656656a1de50 100644 --- a/atom/browser/atom_javascript_dialog_manager.cc +++ b/atom/browser/atom_javascript_dialog_manager.cc @@ -61,9 +61,16 @@ void AtomJavaScriptDialogManager::RunJavaScriptDialog( return; } + // No default button + int default_id = -1; + int cancel_id = 0; + std::vector buttons = {"OK"}; if (dialog_type == JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_CONFIRM) { buttons.push_back("Cancel"); + // First button is default, second button is cancel + default_id = 0; + cancel_id = 1; } origin_counts_[origin]++; @@ -85,8 +92,8 @@ void AtomJavaScriptDialogManager::RunJavaScriptDialog( } atom::ShowMessageBox( - window, atom::MessageBoxType::MESSAGE_BOX_TYPE_NONE, buttons, -1, 0, - atom::MessageBoxOptions::MESSAGE_BOX_NONE, "", + window, atom::MessageBoxType::MESSAGE_BOX_TYPE_NONE, buttons, default_id, + cancel_id, atom::MessageBoxOptions::MESSAGE_BOX_NONE, "", base::UTF16ToUTF8(message_text), "", checkbox, false, gfx::ImageSkia(), base::Bind(&AtomJavaScriptDialogManager::OnMessageBoxCallback, base::Unretained(this), base::Passed(std::move(callback)),