8de0bb5bc3
* chore: bump chromium in DEPS to 138.0.7166.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 138.0.7166.2 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6508373: Add WebContents, Tab getters for future Clank navigation capture rework6508373Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6470924: Introduce auto-populated Search Engine icons.6470924Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6502977: Force same tab navigation while actor coordinator is acting on a tab6502977Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 138.0.7168.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * fix grit patch Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump Chromium to 138.0.7169.2 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * fixup! 6508373: Add WebContents, Tab getters for future Clank navigation capture rework Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6493688: NavigationThrottleRunner2: void CreateThrottlesForNavigation6493688Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6488755: Reland "WebSQL: Remove WebPreference"6488755Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6428707: FSA: Only normalize the hardcoded rules once during initialization6428707Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 138.0.7170.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6514121: Remove origin calculation debug info and related methods6514121Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 138.0.7172.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 138.0.7173.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 138.0.7175.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * fixup! 6514121: Remove origin calculation debug info and related methods Refs6514121Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6531585: Don't retry LayerTreeSink creation on the high priority queue Refs6531585Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6512253: Modernize base::apple's base bundle ID Refs6512253Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * fixup! 6428707: FSA: Only normalize the hardcoded rules once during initialization Refs6428707Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * fixup! 6508373: Add WebContents, Tab getters for future Clank navigation capture rework Refs6508373Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * chore: update patches 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: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
23 lines
817 B
Diff
23 lines
817 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 78d72ec8ed37f4a551ff091038e6741e3f0b9efb..1c9de5cc18ab8656e7a91d5ce3f5a5424b7d8739 100644
|
|
--- a/tools/gritsettings/resource_ids.spec
|
|
+++ b/tools/gritsettings/resource_ids.spec
|
|
@@ -1524,6 +1524,11 @@
|
|
|
|
"third_party/search_engines_data/resources/search_engines_scaled_resources.grd": {
|
|
"structures": [10100],
|
|
+ },
|
|
+
|
|
+ "electron/build/electron_resources.grd": {
|
|
+ "messages": [31750],
|
|
+ "includes": [31950],
|
|
}
|
|
|
|
# END "everything else" section.
|