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

ScopedNestableTaskAllower doesn't take an argument

Browse source
This commit is contained in:
Jeremy Apthorp 2018-09-14 17:13:56 -07:00 • committed by Aleksei Kuzmin
parent b9cd3493ac
commit 5a757449b0
4 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/api/atom_api_menu_mac.mm
View file

@ -97,8 +97,7 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
[popup_controllers_[window_id] setCloseCallback:close_callback]; [popup_controllers_[window_id] setCloseCallback:close_callback];
// Make sure events can be pumped while the menu is up. // Make sure events can be pumped while the menu is up.
base::MessageLoop::ScopedNestableTaskAllower allow( base::MessageLoop::ScopedNestableTaskAllower allow;
base::MessageLoop::current());
// One of the events that could be pumped is |window.close()|. // One of the events that could be pumped is |window.close()|.
// User-initiated event-tracking loops protect against this by // User-initiated event-tracking loops protect against this by

3
atom/browser/api/atom_api_web_contents.cc
View file

@ -1688,8 +1688,7 @@ void WebContents::StartDrag(const mate::Dictionary& item,
// Start dragging. // Start dragging.
if (!files.empty()) { if (!files.empty()) {
base::MessageLoop::ScopedNestableTaskAllower allow( base::MessageLoop::ScopedNestableTaskAllower allow;
base::MessageLoop::current());
DragFileItems(files, icon->image(), web_contents()->GetNativeView()); DragFileItems(files, icon->image(), web_contents()->GetNativeView());
} else { } else {
args->ThrowError("Must specify either 'file' or 'files' option"); args->ThrowError("Must specify either 'file' or 'files' option");

3
chromium_src/chrome/browser/printing/print_job.cc
View file

@ -188,8 +188,7 @@ bool PrintJob::FlushJob(base::TimeDelta timeout) {
FROM_HERE, base::Bind(&PrintJob::Quit, quit_factory_.GetWeakPtr()), FROM_HERE, base::Bind(&PrintJob::Quit, quit_factory_.GetWeakPtr()),
timeout); timeout);
base::MessageLoop::ScopedNestableTaskAllower allow( base::MessageLoop::ScopedNestableTaskAllower allow;
base::MessageLoop::current());
base::RunLoop().Run(); base::RunLoop().Run();
return true; return true;

3
chromium_src/chrome/browser/printing/print_view_manager_base.cc
View file

@ -431,8 +431,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
// Need to enable recursive task. // Need to enable recursive task.
{ {
base::MessageLoop::ScopedNestableTaskAllower allow( base::MessageLoop::ScopedNestableTaskAllower allow;
base::MessageLoop::current());
base::RunLoop().Run(); base::RunLoop().Run();
} }