mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
a06b49aca1
* chore: bump chromium in DEPS to 148.0.7755.0 * chore: bump chromium in DEPS to 148.0.7756.0 * chore: update patches * 7698536: Wire up experiment arms for Glic summarize pdf button. Refs https://chromium-review.googlesource.com/c/chromium/src/+/7698536 * 7695602: Include gperf to sources for iOS builds Refs https://chromium-review.googlesource.com/c/chromium/src/+/7695602 * 7671200: Expose IgnoreDuplicateNavs in WebView Refs https://chromium-review.googlesource.com/c/chromium/src/+/7671200 * chore: bump chromium in DEPS to 148.0.7758.0 * chore: update patches * 7701873: Allow running completion callbacks directly in CommitPresentedFrameToCA() on Mac Refs https://chromium-review.googlesource.com/c/chromium/src/+/7701873 * 7697732: Enhance diagnostic logging for ScreenCaptureKit errors on macOS Refs https://chromium-review.googlesource.com/c/chromium/src/+/7697732 * 7698176: Disallow cookies with empty name and ambiguous value Refs https://chromium-review.googlesource.com/c/chromium/src/+/7698176 * 7607319: Code Health: Use span in base::HexEncode Refs https://chromium-review.googlesource.com/c/chromium/src/+/7607319 * chore: bump chromium in DEPS to 148.0.7759.0 * chore: update patches * 7696478: [extensions] Move StreamContainer to extensions/browser/mime_handler/ Refs https://chromium-review.googlesource.com/c/chromium/src/+/7696478 * 7656748: Fixed controlled frame fullscreen crash Refs https://chromium-review.googlesource.com/c/chromium/src/+/7656748 * chore: update patches * fixup! 7696478: [extensions] Move StreamContainer to extensions/browser/mime_handler/ --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.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 98b18d9e8129f2b06c4633b4ff74320fa2dee5f6..2f9bbe7578ce8e255a4aed6dd9dacea245640795 100644
|
|
--- a/tools/gritsettings/resource_ids.spec
|
|
+++ b/tools/gritsettings/resource_ids.spec
|
|
@@ -1670,6 +1670,11 @@
|
|
"includes": [12000],
|
|
},
|
|
|
|
+ "electron/build/electron_resources.grd": {
|
|
+ "messages": [31750],
|
|
+ "includes": [31950],
|
|
+ }
|
|
+
|
|
# END "everything else" section.
|
|
# Everything but chrome/, components/, content/, and ios/
|
|
|