47572286f3* https://chromium-review.googlesource.com/c/chromium/src/+/6230977 * chore: bump chromium to 135.0.7012.0 * chore: update accelerator.patch Support parsing Ctrl+Alt shortcuts | https://chromium-review.googlesource.com/c/chromium/src/+/6238137 * 6234236: Reapply bindings: Pass CppHeap on Isolate creation | https://chromium-review.googlesource.com/c/chromium/src/+/6234236 * 6234614: [ios blink] Move to use external begin frame source | https://chromium-review.googlesource.com/c/chromium/src/+/6234614 * chore: update chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch no manual changes; patch applied with fuzz * chore: update chromium/build_libc_as_static_library.patch no manual changes; patch applied with fuzz * chore: remove chromium/cherry-pick-dd8e2822e507.patch landed upstream * 6188884: Grit: Remove output_all_resource_defines from list of valid attributes. | https://chromium-review.googlesource.com/c/chromium/src/+/6188884 * 6226981: [views-ax] Remove View::GetAccessibleNodeData() method | https://chromium-review.googlesource.com/c/chromum/src/+/6226981 * 6214895: [views-ax] Deprecate View::NotifyAccessibilityEvent | https://chromium-review.googlesource.com/c/chromium/src/+/6214895 * 6196494: Remove ImageView::SetImage() with ImageSkia param | https://chromium-review.googlesource.com/c/chromium/src/+/6196494 * 6236267: [cleanup] Remove unused PrinterBasicInfo fields | https://chromium-review.googlesource.com/c/chromium/src/+/6236267 * refactor: remove status, isDefault properties from PrinterInfo Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6236267 * chore: lint * fixup: added mas bypass to new file added in https://chromium-review.googlesource.com/c/chromium/src/+/6208630 see slack for more context * chore: node script/gen-libc++-filenames.js * chore: e patches all * fix: duplicate crdtp symbols * chore: update patches * fixup! [Media Features] Remove launched features --------- Co-authored-by: alice <alice@makenotion.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
23 lines
877 B
Diff
23 lines
877 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 9af4abc3411d81d6839937df38f2a3534eeab9cf..f65e8bd618f71ebb8e5ef30a2eeb8e7417be16d2 100644
|
|
--- a/tools/gritsettings/resource_ids.spec
|
|
+++ b/tools/gritsettings/resource_ids.spec
|
|
@@ -1463,6 +1463,11 @@
|
|
"<(SHARED_INTERMEDIATE_DIR)/third_party/blink/public/strings/permission_element_generated_strings.grd": {
|
|
"META": {"sizes": {"messages": [2000],}},
|
|
"messages": [10080],
|
|
+ },
|
|
+
|
|
+ "electron/electron_resources.grd": {
|
|
+ "messages": [31750],
|
|
+ "includes": [31950],
|
|
}
|
|
|
|
# END "everything else" section.
|