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

chore: bump chromium to 32e0bab929213da1019992bf31d29 (master) (#19488)

Browse source
This commit is contained in:
Electron Bot 2019-08-02 16:56:46 -07:00 • committed by Jeremy Apthorp
parent d0800aa200
commit e959137a4b
112 changed files with 524 additions and 5639 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/common/api/BUILD.gn
View file

@ -7,6 +7,6 @@ mojom("mojo") {
public_deps = [
"//mojo/public/mojom/base",
"//ui/gfx/geometry/mojo",
"//ui/gfx/geometry/mojom",
]
}

2
shell/common/api/api.mojom
View file

@ -2,7 +2,7 @@ module electron.mojom;
import "mojo/public/mojom/base/values.mojom";
import "mojo/public/mojom/base/string16.mojom";
import "ui/gfx/geometry/mojo/geometry.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
interface ElectronRenderer {
Message(

10
shell/common/native_mate_converters/net_converter.cc
View file

@ -26,7 +26,6 @@
#include "shell/common/native_mate_converters/string16_converter.h"
#include "shell/common/native_mate_converters/value_converter.h"
#include "shell/common/node_includes.h"
#include "storage/browser/blob/upload_blob_element_reader.h"
namespace mate {
@ -312,11 +311,12 @@ void GetUploadData(base::ListValue* upload_data_list,
const net::UploadFileElementReader* file_reader = reader->AsFileReader();
auto file_path = file_reader->path().AsUTF8Unsafe();
upload_data_dict->SetKey("file", base::Value(file_path));
} else {
const storage::UploadBlobElementReader* blob_reader =
static_cast<storage::UploadBlobElementReader*>(reader.get());
upload_data_dict->SetString("blobUUID", blob_reader->uuid());
}
// else {
// const storage::UploadBlobElementReader* blob_reader =
// static_cast<storage::UploadBlobElementReader*>(reader.get());
// upload_data_dict->SetString("blobUUID", blob_reader->uuid());
// }
upload_data_list->Append(std::move(upload_data_dict));
}
}