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

Reduce the scope of ScopedNestableTaskAllower

Browse source
This commit is contained in:
Cheng Zhao 2016-07-03 15:30:27 +09:00
parent ba1fe322e9
commit 23582cc9d3
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1208,9 +1208,6 @@ void WebContents::EndFrameSubscription() {
void WebContents::StartDrag(const mate::Dictionary& item, void WebContents::StartDrag(const mate::Dictionary& item,
mate::Arguments* args) { mate::Arguments* args) {
base::MessageLoop::ScopedNestableTaskAllower allow(
base::MessageLoop::current());
base::FilePath file; base::FilePath file;
std::vector<base::FilePath> files; std::vector<base::FilePath> files;
if (!item.Get("files", &files) && item.Get("file", &file)) { if (!item.Get("files", &files) && item.Get("file", &file)) {
@ -1230,6 +1227,8 @@ void WebContents::StartDrag(const mate::Dictionary& item,
// Start dragging. // Start dragging.
if (!files.empty()) { if (!files.empty()) {
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("There is nothing to drag"); args->ThrowError("There is nothing to drag");