github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

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