mirror of
https://github.com/electron/electron.git
synced 2026-01-09 15:38:08 -05:00
8ecd064d2c
* chore: bump chromium in DEPS to 144.0.7526.0 * 7138583: [Partitioned Popins Removal] IPC https://chromium-review.googlesource.com/c/chromium/src/+/7138583 * chore: fixup patch indices * 7139794: Partially remove check for global handlers in plugin mime_type code https://chromium-review.googlesource.com/c/chromium/src/+/7139794 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
24 lines
790 B
Diff
24 lines
790 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 6ed8fba243f6351a0f45cf459379e45ba405cf72..1dcc6586a91f716da58c09e1f5a690c75a763136 100644
|
|
--- a/tools/gritsettings/resource_ids.spec
|
|
+++ b/tools/gritsettings/resource_ids.spec
|
|
@@ -1619,6 +1619,11 @@
|
|
"messages": [10120],
|
|
},
|
|
|
|
+ "electron/build/electron_resources.grd": {
|
|
+ "messages": [31750],
|
|
+ "includes": [31950],
|
|
+ }
|
|
+
|
|
# END "everything else" section.
|
|
# Everything but chrome/, components/, content/, and ios/
|
|
|