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

chore: bump chromium to 669e1d2c51901c686b055da965f2d (master) (#21954)

Browse source 
* chore: bump chromium in DEPS to edc531fae69669e1d2c51901c686b055da965f2d

* Update patches

* Update to use content::DevToolsAgentHostClientChannel.

9d14e4b8a3

Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
This commit is contained in:
Electron Bot 2020-01-29 13:45:08 -08:00 • committed by GitHub
parent ca515aea55
commit 0979bfc9c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 95 additions and 97 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 bbc1aa4a9816281fb09647859c3b96e1f9cd0138..9fb4d55d1c527b6e1ba1fc5727b890872ffe3c16 100644
index fe09f99a91e3b1d2abfb335ec2771d1ed8592d87..050102ea2d7cac519c5bba4845021df6f671b4fa 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1488,7 +1488,7 @@ if (is_chrome_branded && !is_android) {
@@ -1489,7 +1489,7 @@ if (is_chrome_branded && !is_android) {
}
}
@ -64,7 +64,7 @@ index bbc1aa4a9816281fb09647859c3b96e1f9cd0138..9fb4d55d1c527b6e1ba1fc5727b89087
chrome_paks("packed_resources") {
if (is_mac) {
output_dir = "$root_gen_dir/repack"
@@ -1508,6 +1508,12 @@ if (!is_android) {
@@ -1509,6 +1509,12 @@ if (!is_android) {
}
}