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

chore: bump chromium to 93.0.4532.2 (main) (#29527)

Browse source 
* chore: bump chromium in DEPS to 93.0.4531.0

* chore: update patches

* Remove IPC::Listener from WebContentsObserver

2910240

* serial: Move serial policy from profile to local state

2914194

* chore: fix pip test

* chore: bump chromium in DEPS to 93.0.4532.2

* chore: update patches

* Follow up ColorChooser clean ups

2928026

* Distinguish between no default printer vs. query error

2932396

* chore: remove build_do_not_include_vr_directx_helpers_when_enable_vr.patch

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
electron-roller[bot] 2021-06-04 19:03:31 -07:00 • committed by GitHub
parent 1c0e8a65c4
commit fa2db00e55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 169 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

6
patches/chromium/resource_file_conflict.patch
View file

@ -52,10 +52,10 @@ Some alternatives to this patch:
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 039bf6ff05e45e62e0e1595cedec6c816d8c72e5..75868925758560075e95b79a7473e635b23127d5 100644
index ac58c2e6696a3e8278dd9d017b4b9671e671edf6..8e07f7000de932bc9b6bf484b1a9fce4d4580b4a 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1534,7 +1534,7 @@ if (is_chrome_branded && !is_android) {
@@ -1536,7 +1536,7 @@ if (is_chrome_branded && !is_android) {
}
}
@ -64,7 +64,7 @@ index 039bf6ff05e45e62e0e1595cedec6c816d8c72e5..75868925758560075e95b79a7473e635
chrome_paks("packed_resources") {
if (is_mac) {
output_dir = "$root_gen_dir/repack"
@@ -1562,6 +1562,12 @@ if (!is_android) {
@@ -1564,6 +1564,12 @@ if (!is_android) {
}
}