edccb0a7ea* chore: bump chromium in DEPS to 140.0.7312.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6769540: Move NetworkTrafficAnnotationTag out of PreconnectManager. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6769540 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6771377: Roll libc++ from 3eda1e62e799 to 569aa83b4bbc (7 revisions) Refs https://chromium-review.googlesource.com/c/chromium/src/+/6771377 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6771398: Remove unnecessary std::optional wrappers in ResolveHostClient Refs https://chromium-review.googlesource.com/c/chromium/src/+/6771398 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * chore: update patches Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6776165: Use shared session bus for MPRIS Refs https://chromium-review.googlesource.com/c/chromium/src/+/6776165 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * chore: update patches --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: patchup[bot] <73610968+patchup[bot]@users.noreply.github.com>
23 lines
792 B
Diff
23 lines
792 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 40441331934df92b9903c005065e6eedcfed69e1..96fc4ccc3f1dd65cf59df4a32adb587193afe6d0 100644
|
|
--- a/tools/gritsettings/resource_ids.spec
|
|
+++ b/tools/gritsettings/resource_ids.spec
|
|
@@ -1547,6 +1547,11 @@
|
|
"structures": [10100],
|
|
},
|
|
|
|
+ "electron/build/electron_resources.grd": {
|
|
+ "messages": [31750],
|
|
+ "includes": [31950],
|
|
+ }
|
|
+
|
|
# END "everything else" section.
|
|
# Everything but chrome/, components/, content/, and ios/
|
|
|