908bef7ca9
* chore: bump chromium in DEPS to 114.0.5696.0 * chore: update patches * chore: revert clang revert (cherry picked from commit 4c3ffa8001b5fdbfc99374bf77895d8d8e35ee31) * test: remove unneeded test for title on ses.setCertificateVerifyProc This test is unnecessary because all that really needs to be verified is that the request was rejected. * chore: Revert "Reland "[BRP] Enable clang plugin check for Linux"" * chore: bump chromium in DEPS to 114.0.5697.0 * chore: bump chromium in DEPS to 114.0.5698.0 * chore: update patches * chore: bump chromium in DEPS to 114.0.5700.0 * chore: update patches * chore: bump chromium in DEPS to 114.0.5702.0 * chore: bump chromium in DEPS to 114.0.5704.0 * chore: update patches * chore: bump chromium in DEPS to 114.0.5705.0 * 4368281: Add bottom-up CertVerifier change observer flow. | https://chromium-review.googlesource.com/c/chromium/src/+/4368281 * 4402277: Enable check_raw_ptr_fields for Linux | https://chromium-review.googlesource.com/c/chromium/src/+/4402277 * 4389621: [ChromeAppsDeprecation] Remove deprecated chrome apps from AppService | https://chromium-review.googlesource.com/c/chromium/src/+/4389621 * 4402191: Allow default initializing BrowserTaskTraits | https://chromium-review.googlesource.com/c/chromium/src/+/4402191 * chore: bump chromium in DEPS to 114.0.5708.0 * chore: remove incorrectly re-added clang patch * chore: update patches (clean sync) * ci: use newer clang for 32-bit Linux ARM Fixes crash on compiling skia/skia/SkPatchUtils.cpp * build: generate new libcxx filenames * 4409898: Update paper printable area in UpdatePrintSettings | https://chromium-review.googlesource.com/c/chromium/src/+/4409898 * chore: update sysroots.json Sysroot CL: https://chromium-review.googlesource.com/c/chromium/src/+/4383374 Chromium CL: 4246577: media/gpu: Add CQP AV1 VA-API video encoder | https://chromium-review.googlesource.com/c/chromium/src/+/4246577 * 4336198: [task] Move source location and use it in v8 platform | https://chromium-review.googlesource.com/c/v8/v8/+/4336198 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: electron-patch-conflict-fixer[bot] <83340002+electron-patch-conflict-fixer[bot]@users.noreply.github.com>
23 lines
784 B
Diff
23 lines
784 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 512ff40f41c675cc1db75a5a5bac7c1a4b111ace..83fe7aa86a736fb2f973830359ed5760e5aae0bd 100644
|
|
--- a/tools/gritsettings/resource_ids.spec
|
|
+++ b/tools/gritsettings/resource_ids.spec
|
|
@@ -1111,6 +1111,11 @@
|
|
"includes": [4960],
|
|
},
|
|
|
|
+ "electron/electron_resources.grd": {
|
|
+ "messages": [31750],
|
|
+ "includes": [31950],
|
|
+ },
|
|
+
|
|
# END "everything else" section.
|
|
# Everything but chrome/, components/, content/, and ios/
|
|
|