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

Merge branch 'content_tracing_patch' of https://github.com/deepak1556/atom-shell into deepak1556-content_tracing_patch

Browse source
This commit is contained in:
Cheng Zhao 2015-11-13 12:29:18 +08:00
commit 996a3c2a35
5 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/common/native_mate_converters/file_path_converter.h
View file

@ -21,6 +21,9 @@ struct Converter<base::FilePath> {
static bool FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val,
base::FilePath* out) {
if (val->IsNull())
return true;
base::FilePath::StringType path;
if (Converter<base::FilePath::StringType>::FromV8(isolate, val, &path)) {
*out = base::FilePath(path);