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

Also fix the Windows and Linux side of async openExternal

Browse source
This commit is contained in:
Cheng Zhao 2016-11-17 12:13:07 +09:00
parent 090a5d9a61
commit 5639faf069
2 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
atom/common/platform_util_linux.cc
View file

@ -92,14 +92,7 @@ bool OpenExternal(const GURL& url, bool activate) {
void OpenExternal(const GURL& url, bool activate, void OpenExternal(const GURL& url, bool activate,
const OpenExternalCallback& callback) { const OpenExternalCallback& callback) {
// TODO(gabriel): Implement async open if callback is specified // TODO(gabriel): Implement async open if callback is specified
bool opened = OpenExternal(url, activate); callback.Run(OpenExternal(url, activate) ? "" : "Failed to open");
v8::Isolate* isolate = v8::Isolate::GetCurrent();
if (!opened) {
callback.Run(v8::Exception::Error(
v8::String::NewFromUtf8(isolate, "Failed to open")));
} else {
callback.Run(v8::Null(isolate));
}
} }
bool MoveItemToTrash(const base::FilePath& full_path) { bool MoveItemToTrash(const base::FilePath& full_path) {

9
atom/common/platform_util_win.cc
View file

@ -319,14 +319,7 @@ bool OpenExternal(const base::string16& url, bool activate) {
void OpenExternal(const base::string16& url, bool activate, void OpenExternal(const base::string16& url, bool activate,
const OpenExternalCallback& callback) { const OpenExternalCallback& callback) {
// TODO(gabriel): Implement async open if callback is specified // TODO(gabriel): Implement async open if callback is specified
bool opened = OpenExternal(url, activate); callback.Run(OpenExternal(url, activate) ? "" : "Failed to open");
v8::Isolate* isolate = v8::Isolate::GetCurrent();
if (!opened) {
callback.Run(v8::Exception::Error(
v8::String::NewFromUtf8(isolate, "Failed to open")));
} else {
callback.Run(v8::Null(isolate));
}
} }
bool MoveItemToTrash(const base::FilePath& path) { bool MoveItemToTrash(const base::FilePath& path) {