mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Calling non-const callbacks requires some tricks

Browse source
This commit is contained in:
Samuel Attard 2017-12-18 12:31:00 +11:00 • committed by Aleksei Kuzmin
parent ce755483ba
commit 0291dc8214
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/atom_javascript_dialog_manager.cc
View file

@ -44,7 +44,7 @@ void AtomJavaScriptDialogManager::RunJavaScriptDialog(
if (dialog_type != JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_ALERT && if (dialog_type != JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_ALERT &&
dialog_type != JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_CONFIRM) { dialog_type != JavaScriptDialogType::JAVASCRIPT_DIALOG_TYPE_CONFIRM) {
callback.Run(false, base::string16()); std::move(callback).Run(false, base::string16());
return; return;
} }
@ -81,7 +81,7 @@ void AtomJavaScriptDialogManager::RunBeforeUnloadDialog(
bool is_reload, bool is_reload,
DialogClosedCallback callback) { DialogClosedCallback callback) {
bool default_prevented = api_web_contents_->Emit("will-prevent-unload"); bool default_prevented = api_web_contents_->Emit("will-prevent-unload");
callback.Run(default_prevented, base::string16()); std::move(callback).Run(default_prevented, base::string16());
return; return;
} }
@ -95,9 +95,13 @@ void AtomJavaScriptDialogManager::OnMessageBoxCallback(
const std::string& origin, const std::string& origin,
int code, int code,
bool checkbox_checked) { bool checkbox_checked) {
<<<<<<< HEAD
if (checkbox_checked) if (checkbox_checked)
origin_counts_[origin] = kUserWantsNoMoreDialogs; origin_counts_[origin] = kUserWantsNoMoreDialogs;
callback.Run(code == 0, base::string16()); callback.Run(code == 0, base::string16());
=======
std::move(callback).Run(code == 0, base::string16());
>>>>>>> Calling non-const callbacks requires some tricks
} }
} // namespace atom } // namespace atom