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

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

Browse source
This commit is contained in:
Cheng Zhao 2016-01-28 18:41:39 +08:00
commit 30ff18ac64
5 changed files with 88 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/net/atom_network_delegate.cc
View file

@ -75,6 +75,10 @@ void ToDictionary(base::DictionaryValue* details, net::URLRequest* request) {
details->SetString("resourceType",
info ? ResourceTypeToString(info->GetResourceType())
: "other");
scoped_ptr<base::ListValue> list(new base::ListValue);
GetUploadData(list.get(), request);
if (!list->empty())
details->Set("uploadData", list.Pass());
}
void ToDictionary(base::DictionaryValue* details,