34a6cd2bd8
* chore: bump chromium in DEPS to 131.0.6778.4 * chore: bump chromium to 131.0.6778.0 (main) (#44251) * chore: bump chromium in DEPS to 131.0.6778.0 * 5803393: [UI] Add alias for mojo version of `MenuSourceType` https://chromium-review.googlesource.com/c/chromium/src/+/5803393 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> (cherry picked from commit ef84f1365014d0b587659fdae5da6542d1ae296a) * chore: bump chromium in DEPS to 132.0.6779.0 (cherry picked from commit 77f17523f2103a3f3521d063c4cc73b018745d42) * chore: update patches (cherry picked from commit fed98882323641f3212f0023c6d46a23ef20e835) * 5904951: controlledframe: Disable File System Access for <controlledframe> https://chromium-review.googlesource.com/c/chromium/src/+/5904951 (cherry picked from commit 289a2fb86aa8d2c4f2431289214ce00fa52a67a7) --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
23 lines
785 B
Diff
23 lines
785 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Thu, 18 Oct 2018 17:07:17 -0700
|
|
Subject: gritsettings_resource_ids.patch
|
|
|
|
Add electron resources file to the list of resource ids generation.
|
|
|
|
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
|
|
index 38cf9d8fd803f47c57d5491648cb6ae445c1c380..935f197f0a47e4786c017e9fdef16b7c597d8fae 100644
|
|
--- a/tools/gritsettings/resource_ids.spec
|
|
+++ b/tools/gritsettings/resource_ids.spec
|
|
@@ -1373,6 +1373,11 @@
|
|
"includes": [10060],
|
|
},
|
|
|
|
+ "electron/electron_resources.grd": {
|
|
+ "messages": [31750],
|
|
+ "includes": [31950],
|
|
+ },
|
|
+
|
|
# END "everything else" section.
|
|
# Everything but chrome/, components/, content/, and ios/
|
|
|