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

fix stale rebase

Browse source
This commit is contained in:
deepak1556 2018-03-12 16:32:10 +09:00 • committed by Aleksei Kuzmin
parent 7e7634d344
commit b08d086b0f
2 changed files with 0 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/atom_javascript_dialog_manager.cc
View file

@ -95,13 +95,9 @@ void AtomJavaScriptDialogManager::OnMessageBoxCallback(
const std::string& origin,
int code,
bool checkbox_checked) {
<<<<<<< HEAD
if (checkbox_checked)
origin_counts_[origin] = kUserWantsNoMoreDialogs;
callback.Run(code == 0, base::string16());
=======
std::move(callback).Run(code == 0, base::string16());
>>>>>>> Calling non-const callbacks requires some tricks
}
} // namespace atom