095ae30f6dchore: bump chromium to 140.0.7339.2 (main) (#47929) * chore: bump chromium in DEPS to 140.0.7330.0 * chore: bump chromium in DEPS to 140.0.7331.0 * chore: update patches * fix: gn check failing on crashpad.h Not yet sure what caused this * fix: predictors::PreconnectManager -> content::PreconnectManager CL: https://chromium-review.googlesource.com/c/chromium/src/+/6788473 * chore: bump chromium in DEPS to 140.0.7333.0 * chore: bump chromium in DEPS to 140.0.7335.0 * chore: bump chromium in DEPS to 140.0.7337.0 * chore: update patches * chore: restore some gin utility * 6804057: [Extensions] Validate nodoc is specified as a boolean in schemas https://chromium-review.googlesource.com/c/chromium/src/+/6804057 * fixup! chore: restore some gin utility * fixup! fix: predictors::PreconnectManager -> content::PreconnectManager CL: https://chromium-review.googlesource.com/c/chromium/src/+/6788473 * 6772346: Reset MouseWheelPhaseHandler state when trackpoint scroll is detected https://chromium-review.googlesource.com/c/chromium/src/+/6772346 Not certain about what the "correct" argument to pass here is. A quick dive into the CL suggests that passing `false` is safe to keep things working. The blast radius if this assumption is wrong is that "fling" scroll gestures may not work as expected with the OSR. * 6789383: Uninstall SODA language pack after 30 days of inactivity https://chromium-review.googlesource.com/c/chromium/src/+/6789383 * chore: update libcxx filenames * chore: bump chromium in DEPS to 140.0.7339.0 * chore: update patches * fixup! 6772346: Reset MouseWheelPhaseHandler state when trackpoint scroll is detected https://chromium-review.googlesource.com/c/chromium/src/+/6772346 * chore: bump chromium in DEPS to 140.0.7339.2 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> Co-authored-by: deepak1556 <hop2deep@gmail.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 972382ea6c9043e06779330a11de90f87e2a11cd..cc8fbf5d6f62390ebbe9aea0bcfe38b8430ec734 100644
|
|
--- a/tools/gritsettings/resource_ids.spec
|
|
+++ b/tools/gritsettings/resource_ids.spec
|
|
@@ -1554,6 +1554,11 @@
|
|
"structures": [10100],
|
|
},
|
|
|
|
+ "electron/build/electron_resources.grd": {
|
|
+ "messages": [31750],
|
|
+ "includes": [31950],
|
|
+ }
|
|
+
|
|
# END "everything else" section.
|
|
# Everything but chrome/, components/, content/, and ios/
|
|
|