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

chore: modernize Value usage in converters (#34794)

Browse source 
* chore: modernize Value usage in converters

* Date is parsed as an empty object now
This commit is contained in:
Jeremy Rose 2022-07-05 08:25:18 -07:00 • committed by GitHub
parent d28ed0da20
commit 0ee7f14190
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 203 additions and 829 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shell/browser/net/electron_url_loader_factory.cc
View file

@ -114,9 +114,9 @@ network::mojom::URLResponseHeadPtr ToResponseHead(
bool has_mime_type = dict.Get("mimeType", &head->mime_type);
bool has_content_type = false;
base::DictionaryValue headers;
base::Value::Dict headers;
if (dict.Get("headers", &headers)) {
for (const auto iter : headers.DictItems()) {
for (const auto iter : headers) {
if (iter.second.is_string()) {
// key, value
head->headers->AddHeader(iter.first, iter.second.GetString());
@ -513,7 +513,7 @@ void ElectronURLLoaderFactory::StartLoadingHttp(
if (!dict.Get("method", &request->method))
request->method = original_request.method;
base::DictionaryValue upload_data;
base::Value::Dict upload_data;
if (request->method != net::HttpRequestHeaders::kGetMethod &&
request->method != net::HttpRequestHeaders::kHeadMethod)
dict.Get("uploadData", &upload_data);

12
shell/browser/net/url_pipe_loader.cc
View file

@ -19,7 +19,7 @@ URLPipeLoader::URLPipeLoader(
mojo::PendingReceiver<network::mojom::URLLoader> loader,
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
const net::NetworkTrafficAnnotationTag& annotation,
base::DictionaryValue upload_data)
base::Value::Dict upload_data)
: url_loader_(this, std::move(loader)), client_(std::move(client)) {
url_loader_.set_disconnect_handler(base::BindOnce(
&URLPipeLoader::NotifyComplete, base::Unretained(this), net::ERR_FAILED));
@ -37,17 +37,17 @@ void URLPipeLoader::Start(
scoped_refptr<network::SharedURLLoaderFactory> factory,
std::unique_ptr<network::ResourceRequest> request,
const net::NetworkTrafficAnnotationTag& annotation,
base::DictionaryValue upload_data) {
base::Value::Dict upload_data) {
loader_ = network::SimpleURLLoader::Create(std::move(request), annotation);
loader_->SetOnResponseStartedCallback(base::BindOnce(
&URLPipeLoader::OnResponseStarted, weak_factory_.GetWeakPtr()));
// TODO(zcbenz): The old protocol API only supports string as upload data,
// we should seek to support more types in future.
std::string content_type, data;
if (upload_data.GetString("contentType", &content_type) &&
upload_data.GetString("data", &data))
loader_->AttachStringForUpload(data, content_type);
std::string* content_type = upload_data.FindString("contentType");
std::string* data = upload_data.FindString("data");
if (content_type && data)
loader_->AttachStringForUpload(*data, *content_type);
loader_->DownloadAsStream(factory.get(), this);
}

4
shell/browser/net/url_pipe_loader.h
View file

@ -39,7 +39,7 @@ class URLPipeLoader : public network::mojom::URLLoader,
mojo::PendingReceiver<network::mojom::URLLoader> loader,
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
const net::NetworkTrafficAnnotationTag& annotation,
base::DictionaryValue upload_data);
base::Value::Dict upload_data);
// disable copy
URLPipeLoader(const URLPipeLoader&) = delete;
@ -51,7 +51,7 @@ class URLPipeLoader : public network::mojom::URLLoader,
void Start(scoped_refptr<network::SharedURLLoaderFactory> factory,
std::unique_ptr<network::ResourceRequest> request,
const net::NetworkTrafficAnnotationTag& annotation,
base::DictionaryValue upload_data);
base::Value::Dict upload_data);
void NotifyComplete(int result);
void OnResponseStarted(const GURL& final_url,
const network::mojom::URLResponseHead& response_head);