From 8948e27ced93a6529d2f17aad594f506888b643b Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Wed, 9 Jan 2019 12:10:26 -0800 Subject: [PATCH] ScopedNestableTaskAllower in MessageLoopCurrent https://chromium-review.googlesource.com/c/chromium/src/+/1020288 --- atom/browser/api/atom_api_menu_mac.mm | 2 +- atom/browser/api/atom_api_web_contents.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/atom/browser/api/atom_api_menu_mac.mm b/atom/browser/api/atom_api_menu_mac.mm index bec33b934a..2f647a8b67 100644 --- a/atom/browser/api/atom_api_menu_mac.mm +++ b/atom/browser/api/atom_api_menu_mac.mm @@ -99,7 +99,7 @@ void MenuMac::PopupOnUI(const base::WeakPtr& native_window, [popup_controllers_[window_id] setCloseCallback:close_callback]; // Make sure events can be pumped while the menu is up. - base::MessageLoop::ScopedNestableTaskAllower allow; + base::MessageLoopCurrent::ScopedNestableTaskAllower allow; // One of the events that could be pumped is |window.close()|. // User-initiated event-tracking loops protect against this by diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index bca6c65130..37639571cd 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -1793,7 +1793,7 @@ void WebContents::StartDrag(const mate::Dictionary& item, // Start dragging. if (!files.empty()) { - base::MessageLoop::ScopedNestableTaskAllower allow; + base::MessageLoopCurrent::ScopedNestableTaskAllower allow; DragFileItems(files, icon->image(), web_contents()->GetNativeView()); } else { args->ThrowError("Must specify either 'file' or 'files' option");