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

Replace somemore uses of SetStringWithoutPathExpansion

Browse source
This commit is contained in:
deepak1556 2017-11-27 13:28:49 +05:30 committed by Cheng Zhao
parent 69ca6ccdc1
commit d846c9006e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/common/native_mate_converters/content_converter.cc
View file

@ -221,16 +221,16 @@ Converter<scoped_refptr<ResourceRequestBody>>::ToV8(
post_data_dict->Set("bytes", std::move(bytes)); post_data_dict->Set("bytes", std::move(bytes));
} else if (type == ResourceRequestBody::Element::TYPE_FILE) { } else if (type == ResourceRequestBody::Element::TYPE_FILE) {
post_data_dict->SetString("type", "file"); post_data_dict->SetString("type", "file");
post_data_dict->SetStringWithoutPathExpansion( post_data_dict->SetKey("filePath",
"filePath", element.path().AsUTF8Unsafe()); base::Value(element.path().AsUTF8Unsafe()));
post_data_dict->SetInteger("offset", static_cast<int>(element.offset())); post_data_dict->SetInteger("offset", static_cast<int>(element.offset()));
post_data_dict->SetInteger("length", static_cast<int>(element.length())); post_data_dict->SetInteger("length", static_cast<int>(element.length()));
post_data_dict->SetDouble( post_data_dict->SetDouble(
"modificationTime", element.expected_modification_time().ToDoubleT()); "modificationTime", element.expected_modification_time().ToDoubleT());
} else if (type == ResourceRequestBody::Element::TYPE_FILE_FILESYSTEM) { } else if (type == ResourceRequestBody::Element::TYPE_FILE_FILESYSTEM) {
post_data_dict->SetString("type", "fileSystem"); post_data_dict->SetString("type", "fileSystem");
post_data_dict->SetStringWithoutPathExpansion( post_data_dict->SetKey("fileSystemURL",
"fileSystemURL", element.filesystem_url().spec()); base::Value(element.filesystem_url().spec()));
post_data_dict->SetInteger("offset", static_cast<int>(element.offset())); post_data_dict->SetInteger("offset", static_cast<int>(element.offset()));
post_data_dict->SetInteger("length", static_cast<int>(element.length())); post_data_dict->SetInteger("length", static_cast<int>(element.length()));
post_data_dict->SetDouble( post_data_dict->SetDouble(

4
atom/common/native_mate_converters/net_converter.cc
View file

@ -203,7 +203,7 @@ void FillRequestDetails(base::DictionaryValue* details,
details->SetString("method", request->method()); details->SetString("method", request->method());
std::string url; std::string url;
if (!request->url_chain().empty()) url = request->url().spec(); if (!request->url_chain().empty()) url = request->url().spec();
details->SetStringWithoutPathExpansion("url", url); details->SetKey("url", base::Value(url));
details->SetString("referrer", request->referrer()); details->SetString("referrer", request->referrer());
std::unique_ptr<base::ListValue> list(new base::ListValue); std::unique_ptr<base::ListValue> list(new base::ListValue);
GetUploadData(list.get(), request); GetUploadData(list.get(), request);
@ -239,7 +239,7 @@ void GetUploadData(base::ListValue* upload_data_list,
const net::UploadFileElementReader* file_reader = const net::UploadFileElementReader* file_reader =
reader->AsFileReader(); reader->AsFileReader();
auto file_path = file_reader->path().AsUTF8Unsafe(); auto file_path = file_reader->path().AsUTF8Unsafe();
upload_data_dict->SetStringWithoutPathExpansion("file", file_path); upload_data_dict->SetKey("file", base::Value(file_path));
} else { } else {
const storage::UploadBlobElementReader* blob_reader = const storage::UploadBlobElementReader* blob_reader =
static_cast<storage::UploadBlobElementReader*>(reader.get()); static_cast<storage::UploadBlobElementReader*>(reader.get());