mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
6df6ec5f09
* chore: bump chromium in DEPS to 148.0.7739.0 * chore: bump chromium in DEPS to 148.0.7740.0 * 7654582: Delete obsolete kEnableServiceWorkersForChromeScheme feature flag. https://chromium-review.googlesource.com/c/chromium/src/+/7654582 * chore: fixup patch indices * chore: fixup patch indices * 7664982: Move SharedModuleService to //extensions https://chromium-review.googlesource.com/c/chromium/src/+/7664982 * chore: bump chromium in DEPS to 148.0.7741.0 * chore: fixup patch indices * 7666060: [CodeHealth] Replace `RequestPermissions` with `RequestPermissionsFromCurrentDocument` https://chromium-review.googlesource.com/c/chromium/src/+/7666060 --------- 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 bc4d99704dcdb1f2d688fb6d847304ac7a45d3a8..5087a431bb9bd1fba7779f01c738c9d19cbfb63c 100644
|
|
--- a/tools/gritsettings/resource_ids.spec
|
|
+++ b/tools/gritsettings/resource_ids.spec
|
|
@@ -1661,6 +1661,11 @@
|
|
"includes": [12000],
|
|
},
|
|
|
|
+ "electron/build/electron_resources.grd": {
|
|
+ "messages": [31750],
|
|
+ "includes": [31950],
|
|
+ }
|
|
+
|
|
# END "everything else" section.
|
|
# Everything but chrome/, components/, content/, and ios/
|
|
|