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

Merge branch 'master' into chrome35

Browse source 
Conflicts:
	atom/browser/native_window_gtk.h
This commit is contained in:
Cheng Zhao 2014-07-07 23:49:28 +08:00
commit ee5312fff9
12 changed files with 37 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/common/platform_util_win.cc
View file

@ -175,7 +175,7 @@ void MoveItemToTrash(const base::FilePath& path) {
SHFILEOPSTRUCT file_operation = {0};
file_operation.wFunc = FO_DELETE;
file_operation.pFrom = double_terminated_path;
file_operation.fFlags = FOF_ALLOWUNDO;
file_operation.fFlags = FOF_ALLOWUNDO | FOF_SILENT | FOF_NOCONFIRMATION;
SHFileOperation(&file_operation);
}