diff --git a/BUILD.gn b/BUILD.gn
index ffd38ce3a8c29..7b32da03ec35f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -351,6 +351,7 @@ source_set("electron_lib") {
"shell/common/api:mojo",
"//base:base_static",
"//base/allocator:buildflags",
+ "//chrome:strings",
"//chrome/app:command_ids",
"//chrome/app/resources:platform_locale_settings",
"//components/autofill/core/common:features",
diff --git a/electron_paks.gni b/electron_paks.gni
index 0140e358710f6..2b089fa53b940 100644
--- a/electron_paks.gni
+++ b/electron_paks.gni
@@ -54,6 +54,8 @@ template("electron_extra_paks") {
])
output = "${invoker.output_dir}/resources.pak"
sources = [
+ "$root_gen_dir/chrome/browser_resources.pak",
+ "$root_gen_dir/chrome/common_resources.pak",
"$root_gen_dir/chrome/dev_ui_browser_resources.pak",
"$root_gen_dir/components/components_resources.pak",
"$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
@@ -70,6 +72,8 @@ template("electron_extra_paks") {
]
deps = [
"//chrome/browser:dev_ui_browser_resources",
+ "//chrome/browser:resources",
+ "//chrome/common:resources",
"//components/resources",
"//content:content_resources",
"//content:dev_ui_content_resources",
@@ -173,17 +177,23 @@ template("electron_paks") {
}
source_patterns = [
+ "${root_gen_dir}/chrome/locale_settings_",
"${root_gen_dir}/chrome/platform_locale_settings_",
+ "${root_gen_dir}/chrome/generated_resources_",
+ "${root_gen_dir}/components/strings/components_locale_settings_",
"${root_gen_dir}/components/strings/components_strings_",
- "${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
"${root_gen_dir}/device/bluetooth/strings/bluetooth_strings_",
"${root_gen_dir}/services/strings/services_strings_",
+ "${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
"${root_gen_dir}/ui/strings/app_locale_settings_",
"${root_gen_dir}/ui/strings/ax_strings_",
"${root_gen_dir}/ui/strings/ui_strings_",
]
deps = [
+ "//chrome/app:generated_resources",
+ "//chrome/app/resources:locale_settings",
"//chrome/app/resources:platform_locale_settings",
+ "//components/strings:components_locale_settings",
"//components/strings:components_strings",
"//device/bluetooth/strings",
"//services/strings",
diff --git a/electron_resources.grd b/electron_resources.grd
index 08eb971b39249..8e492ad82347d 100644
--- a/electron_resources.grd
+++ b/electron_resources.grd
@@ -11,15 +11,8 @@
-
-
-
-
-
-
diff --git a/electron_strings.grdp b/electron_strings.grdp
deleted file mode 100644
index 5068141716d7a..0000000000000
--- a/electron_strings.grdp
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-
-
- Close
-
-
- Minimize
-
-
- Maximize
-
-
- Restore
-
-
-
-
- Printing Service
-
-
- The selected printer is not available or not installed correctly. <br> Check your printer or try selecting another printer.
-
-
- Untitled Document
-
-
-
-
- Entire Screen
-
-
- {SCREEN_INDEX, plural, =1{Screen #} other{Screen #}}
-
-
-
-
- Image Files
-
-
- Audio Files
-
-
- Video Files
-
-
- Custom Files
-
-
- download
-
-
-
-
-
- Picture in Picture
-
-
-
-
- Picture in picture
-
-
-
- Pause
-
-
- Play
-
-
- Play from the beginning
-
-
- Back to video player
-
-
- Mute
-
-
- Unmute
-
-
- Skip Ad
-
-
- Mute microphone
-
-
- Unmute microphone
-
-
- Turn on camera
-
-
- Turn off camera
-
-
- Hang up
-
-
- Close
-
-
- Resize
-
-
- Toggle video to play or pause
-
-
- Toggle mute
-
-
- Next track
-
-
- Previous track
-
-
- en-US
-
-
- en-US,en
-
-
-
- Windows Utilities
-
-
-
- More actions
-
-
-
- $199+
-
-
- {MAX_UNREAD_NOTIFICATIONS, plural, =1 {More than 1 unread notification} other {More than # unread notifications}}
-
-
- Unread Notifications
-
-
- {UNREAD_NOTIFICATIONS, plural, =1 {1 Unread Notification} other {# Unread Notifications}}
-
-
- Unknown Device ($11234:abcd)
-
-
-
- Unlabeled graphic
-
-
-
-
- Unlabeled image
-
-
-
-
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 1487c1a4cc111..cd928849ccf21 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -54,7 +54,6 @@ feat_add_set_theme_source_to_allow_apps_to.patch
add_webmessageportconverter_entangleandinjectmessageportchannel.patch
ignore_rc_check.patch
remove_usage_of_incognito_apis_in_the_spellchecker.patch
-chore_use_electron_resources_not_chrome_for_spellchecker.patch
allow_disabling_blink_scheduler_throttling_per_renderview.patch
hack_plugin_response_interceptor_to_point_to_electron.patch
feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
@@ -77,7 +76,6 @@ skip_atk_toolchain_check.patch
worker_feat_add_hook_to_notify_script_ready.patch
chore_provide_iswebcontentscreationoverridden_with_full_params.patch
fix_properly_honor_printing_page_ranges.patch
-fix_use_electron_generated_resources.patch
chore_expose_v8_initialization_isolate_callbacks.patch
export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
fix_export_zlib_symbols.patch
diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
index 435d66c466712..27b5422532cc3 100644
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -33,7 +33,7 @@ index 1f86073736f849e797e029678bc212ce96ba0bd9..b8abc10e48bdff0f4e6c3f8e1c4927bc
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index a99ce094addf69f21f3c42690defc445eff8fa05..797c8add1af6df1142179388ef1b7a5bf977d527 100644
+index 72c3a67361eaecbe7349db00bbd3b7c1deaced69..16c923640286837e93f0e7dddefc1d91740238c8 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4518,7 +4518,7 @@ static_library("browser") {
diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
deleted file mode 100644
index 99d292f285fb0..0000000000000
--- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard
-Date: Wed, 23 Oct 2019 14:17:18 -0700
-Subject: chore: use electron resources not chrome for spellchecker
-
-spellchecker uses a few IDS_ resources. We need to load these from
-Electrons grit header instead of Chromes
-
-diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 72c3a67361eaecbe7349db00bbd3b7c1deaced69..a99ce094addf69f21f3c42690defc445eff8fa05 100644
---- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
-@@ -7135,6 +7135,7 @@ static_library("browser") {
- deps += [
- "//components/spellcheck/browser",
- "//components/spellcheck/common",
-+ "//electron:resources",
- ]
-
- if (!is_android) {
-diff --git a/chrome/browser/spellchecker/spellcheck_factory.cc b/chrome/browser/spellchecker/spellcheck_factory.cc
-index 7c3b6a69acb16186add5d467dbc22360d90d46d4..703e2ce60f4f35f9c71e8b503ffd62f9ea8f365a 100644
---- a/chrome/browser/spellchecker/spellcheck_factory.cc
-+++ b/chrome/browser/spellchecker/spellcheck_factory.cc
-@@ -7,7 +7,7 @@
- #include "build/build_config.h"
- #include "chrome/browser/profiles/incognito_helpers.h"
- #include "chrome/browser/spellchecker/spellcheck_service.h"
--#include "chrome/grit/locale_settings.h"
-+#include "electron/grit/electron_resources.h"
- #include "components/keyed_service/content/browser_context_dependency_manager.h"
- #include "components/pref_registry/pref_registry_syncable.h"
- #include "components/prefs/pref_service.h"
-diff --git a/components/language/core/browser/BUILD.gn b/components/language/core/browser/BUILD.gn
-index fdba4ca90882656d6ba369dae48d5dfc13991cb8..fb3b759362275aafd4ed01a7865a4dd0dfaad727 100644
---- a/components/language/core/browser/BUILD.gn
-+++ b/components/language/core/browser/BUILD.gn
-@@ -30,6 +30,7 @@ static_library("browser") {
- "//components/pref_registry",
- "//components/prefs",
- "//components/strings",
-+ "//electron:resources",
- "//ui/base",
- ]
- }
-diff --git a/components/language/core/browser/language_prefs.cc b/components/language/core/browser/language_prefs.cc
-index 26f86d67c32b2a022698ae5ea5509912d2ccfacb..d48844d49308d67ee7bfa823335c7443173badbe 100644
---- a/components/language/core/browser/language_prefs.cc
-+++ b/components/language/core/browser/language_prefs.cc
-@@ -22,7 +22,7 @@
- #include "components/pref_registry/pref_registry_syncable.h"
- #include "components/prefs/pref_service.h"
- #include "components/prefs/scoped_user_pref_update.h"
--#include "components/strings/grit/components_locale_settings.h"
-+#include "electron/grit/electron_resources.h"
- #include "ui/base/l10n/l10n_util.h"
-
- namespace language {
diff --git a/patches/chromium/desktop_media_list.patch b/patches/chromium/desktop_media_list.patch
index 4db38bb6a59dd..dc25d3074782c 100644
--- a/patches/chromium/desktop_media_list.patch
+++ b/patches/chromium/desktop_media_list.patch
@@ -82,18 +82,9 @@ index 1e4a652634fbde2ca9a256baca840bbc5a0e001f..546f5bc3a2f79035f0eec196d9e704b8
const Source& GetSource(int index) const override;
DesktopMediaList::Type GetMediaListType() const override;
diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-index 6d8c9d940bb4488ffedc1eb8c543c065bb3953c9..2026b926eee56f6b235963b23ab86b2743eaed90 100644
+index 6d8c9d940bb4488ffedc1eb8c543c065bb3953c9..d5092cb0245a4b8dc26073741f0bc6657b943bdd 100644
--- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
+++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-@@ -18,7 +18,7 @@
- #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
- #include "chrome/browser/media/webrtc/desktop_media_list.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "content/public/browser/browser_task_traits.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/common/content_features.h"
@@ -127,8 +127,9 @@ BOOL CALLBACK AllHwndCollector(HWND hwnd, LPARAM param) {
#endif // BUILDFLAG(IS_WIN)
diff --git a/patches/chromium/fix_use_electron_generated_resources.patch b/patches/chromium/fix_use_electron_generated_resources.patch
deleted file mode 100644
index 686e94326c210..0000000000000
--- a/patches/chromium/fix_use_electron_generated_resources.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shelley Vohr
-Date: Thu, 24 Sep 2020 11:10:41 -0700
-Subject: fix: use electron generated resources
-
-This patch fixes a few instances where we need to use Electron generated
-resources for IDS strings, or the IDs will be wrong and cause DCHECKS
-as they will loaded as empty strings.
-
-* IDS_UTILITY_PROCESS_UTILITY_WIN_NAME on Windows
-* IDR_PDF_MANIFEST on Linux
-* IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME on Windows
-
-diff --git a/chrome/browser/pdf/pdf_extension_util.cc b/chrome/browser/pdf/pdf_extension_util.cc
-index ccb9d3fb018b4153cfebad8b87579dd5005398e9..5ee9583dddcceed80c7a6e0fa6a0365dbd6c9a6a 100644
---- a/chrome/browser/pdf/pdf_extension_util.cc
-+++ b/chrome/browser/pdf/pdf_extension_util.cc
-@@ -11,8 +11,7 @@
- #include "build/chromeos_buildflags.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/common/chrome_content_client.h"
--#include "chrome/grit/browser_resources.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "components/strings/grit/components_strings.h"
- #include "components/zoom/page_zoom_constants.h"
- #include "ui/base/l10n/l10n_util.h"
-diff --git a/chrome/browser/printing/printing_service.cc b/chrome/browser/printing/printing_service.cc
-index 6d18517898c11c6a628cec2eade57fe845827b3d..a21f52e8a3c6f80d69b27faae4b77700fdd09e35 100644
---- a/chrome/browser/printing/printing_service.cc
-+++ b/chrome/browser/printing/printing_service.cc
-@@ -5,7 +5,7 @@
- #include "chrome/browser/printing/printing_service.h"
-
- #include "base/no_destructor.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "chrome/services/printing/public/mojom/printing_service.mojom.h"
- #include "content/public/browser/service_process_host.h"
-
-diff --git a/chrome/browser/win/icon_reader_service.cc b/chrome/browser/win/icon_reader_service.cc
-index d5497a7e26cdb66c7c074bc509e2bfec7d7875cd..62d2f555253eef903bd04ff1a0ad37d1470309e0 100644
---- a/chrome/browser/win/icon_reader_service.cc
-+++ b/chrome/browser/win/icon_reader_service.cc
-@@ -4,7 +4,7 @@
-
- #include "chrome/browser/win/icon_reader_service.h"
-
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "chrome/services/util_win/public/mojom/util_read_icon.mojom.h"
- #include "content/public/browser/service_process_host.h"
-
diff --git a/patches/chromium/picture-in-picture.patch b/patches/chromium/picture-in-picture.patch
index f5b2e1333c446..b22235fd4e639 100644
--- a/patches/chromium/picture-in-picture.patch
+++ b/patches/chromium/picture-in-picture.patch
@@ -8,50 +8,11 @@ chrome's generated resources for our own. This updates the #include so that we
don't get errors for Chrome's generated resources, which are non-existent
because we don't generate them in our build.
-diff --git a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
-index 7bc8d118f87b91baf1c3bd1d34374996ab1d3638..2d2c1c86f311b07f0c2b09d5a4c082cc5599600c 100644
---- a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
-+++ b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
-@@ -5,7 +5,7 @@
- #include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
-
- #include "chrome/browser/ui/color/chrome_color_id.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
- #include "ui/base/models/image_model.h"
-diff --git a/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
-index d566dbf99ea1164c6a8407026a9839218a6ba1fb..239cd53d70c547c79214988a82efdc8c472d553c 100644
---- a/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
-+++ b/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
-@@ -5,7 +5,7 @@
- #include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
-
- #include "chrome/browser/ui/color/chrome_color_id.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "third_party/skia/include/core/SkColor.h"
- #include "ui/base/cursor/cursor.h"
- #include "ui/base/l10n/l10n_util.h"
-diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc
-index a3d9c0f03c8ade2553bad5721d4e15e6fd658074..b3b043cbf9144013bf7903121575b31b348ea87e 100644
---- a/chrome/browser/ui/views/overlay/close_image_button.cc
-+++ b/chrome/browser/ui/views/overlay/close_image_button.cc
-@@ -6,7 +6,7 @@
-
- #include "build/chromeos_buildflags.h"
- #include "chrome/browser/ui/color/chrome_color_id.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
- #include "ui/base/models/image_model.h"
diff --git a/chrome/browser/ui/views/overlay/document_overlay_window_views.cc b/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
-index 3309906bcae27ba89d73ce4fba49843a10cd31f6..9f828f70606238186b35b5e1ca8751134eaf3c33 100644
+index 3309906bcae27ba89d73ce4fba49843a10cd31f6..987917a440480130d35f34f85c27ff7c27632fd9 100644
--- a/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
-@@ -15,24 +15,28 @@
+@@ -15,15 +15,19 @@
#include "base/timer/timer.h"
#include "build/build_config.h"
#include "chrome/app/vector_icons/vector_icons.h"
@@ -71,16 +32,6 @@ index 3309906bcae27ba89d73ce4fba49843a10cd31f6..9f828f70606238186b35b5e1ca875113
#include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
#include "chrome/browser/ui/views/overlay/close_image_button.h"
#include "chrome/browser/ui/views/overlay/resize_handle_button.h"
--#include "chrome/grit/generated_resources.h"
- #include "components/omnibox/browser/location_bar_model_impl.h"
- #include "components/vector_icons/vector_icons.h"
- #include "content/public/browser/document_picture_in_picture_window_controller.h"
- #include "content/public/browser/picture_in_picture_window_controller.h"
- #include "content/public/browser/web_contents.h"
-+#include "electron/grit/electron_resources.h"
- #include "content/public/common/content_constants.h"
- #include "media/base/media_switches.h"
- #include "media/base/video_util.h"
@@ -57,7 +61,7 @@
#include "ui/aura/window.h"
#endif
@@ -161,24 +112,11 @@ index b2b178ccadce82f8d4ec8e5a6dafe1c67bcecd74..603d82a461c4c443ac26c85a46fbd866
// OverlayWindowViews
bool ControlsHitTestContainsPoint(const gfx::Point& point) override;
-diff --git a/chrome/browser/ui/views/overlay/hang_up_button.cc b/chrome/browser/ui/views/overlay/hang_up_button.cc
-index 75bfe0f7a4d759f677cad5c365fa7f98121d54de..cb251381f1c77ad01d4906132f3d68865aaace10 100644
---- a/chrome/browser/ui/views/overlay/hang_up_button.cc
-+++ b/chrome/browser/ui/views/overlay/hang_up_button.cc
-@@ -6,7 +6,7 @@
-
- #include "chrome/browser/ui/color/chrome_color_id.h"
- #include "chrome/browser/ui/views/overlay/constants.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "components/vector_icons/vector_icons.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc
-index 850b34e3b40f7ff1848c66158976db079e0853bd..105dbc3661eb2710b2f10ca6584e85c36ad14705 100644
+index 850b34e3b40f7ff1848c66158976db079e0853bd..74178fd4752e9c469d50ccafda61157acd9edd56 100644
--- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
-@@ -14,13 +14,15 @@
+@@ -14,9 +14,11 @@
#include "base/time/time.h"
#include "base/timer/timer.h"
#include "build/build_config.h"
@@ -186,15 +124,10 @@ index 850b34e3b40f7ff1848c66158976db079e0853bd..105dbc3661eb2710b2f10ca6584e85c3
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
--#include "chrome/grit/generated_resources.h"
+#endif
+ #include "chrome/grit/generated_resources.h"
#include "components/vector_icons/vector_icons.h"
#include "content/public/browser/picture_in_picture_window_controller.h"
- #include "content/public/browser/web_contents.h"
-+#include "electron/grit/electron_resources.h"
- #include "ui/base/hit_test.h"
- #include "ui/display/display.h"
- #include "ui/display/screen.h"
@@ -36,7 +38,7 @@
#include "ui/aura/window.h"
#endif
@@ -204,86 +137,8 @@ index 850b34e3b40f7ff1848c66158976db079e0853bd..105dbc3661eb2710b2f10ca6584e85c3
#include "chrome/browser/shell_integration_win.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
-diff --git a/chrome/browser/ui/views/overlay/playback_image_button.cc b/chrome/browser/ui/views/overlay/playback_image_button.cc
-index cb1621a9deefcec601d7537e2cc2fbd24e5f7f64..2d74ab12e1eaf77a6f9dde13e894172d6835e061 100644
---- a/chrome/browser/ui/views/overlay/playback_image_button.cc
-+++ b/chrome/browser/ui/views/overlay/playback_image_button.cc
-@@ -7,7 +7,7 @@
- #include "chrome/app/vector_icons/vector_icons.h"
- #include "chrome/browser/ui/color/chrome_color_id.h"
- #include "chrome/browser/ui/views/overlay/constants.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "components/vector_icons/vector_icons.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
-diff --git a/chrome/browser/ui/views/overlay/resize_handle_button.cc b/chrome/browser/ui/views/overlay/resize_handle_button.cc
-index 8bf217b9b0c2bd22d6940c24c58eccb9865c5286..91f061a1243135db475371dda00c2fe054f4e8e3 100644
---- a/chrome/browser/ui/views/overlay/resize_handle_button.cc
-+++ b/chrome/browser/ui/views/overlay/resize_handle_button.cc
-@@ -6,7 +6,7 @@
-
- #include "chrome/app/vector_icons/vector_icons.h"
- #include "chrome/browser/ui/color/chrome_color_id.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "ui/base/hit_test.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
-diff --git a/chrome/browser/ui/views/overlay/skip_ad_label_button.cc b/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
-index 51c7db1bfbd3c03b9cb2786c8c7482b33e3aca0b..2890f7420d2fd258f84019963eab6c9606e228db 100644
---- a/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
-+++ b/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
-@@ -5,7 +5,7 @@
- #include "chrome/browser/ui/views/overlay/skip_ad_label_button.h"
-
- #include "chrome/browser/ui/color/chrome_color_id.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
- #include "ui/gfx/color_palette.h"
-diff --git a/chrome/browser/ui/views/overlay/toggle_camera_button.cc b/chrome/browser/ui/views/overlay/toggle_camera_button.cc
-index 20b82ff4dcf7fef3315b2b47bb480446509c6541..244a50e57b6c12680405c92f0ecbdbdb8bcfcb4f 100644
---- a/chrome/browser/ui/views/overlay/toggle_camera_button.cc
-+++ b/chrome/browser/ui/views/overlay/toggle_camera_button.cc
-@@ -6,7 +6,7 @@
-
- #include "chrome/browser/ui/color/chrome_color_id.h"
- #include "chrome/browser/ui/views/overlay/constants.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "components/vector_icons/vector_icons.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
-diff --git a/chrome/browser/ui/views/overlay/toggle_microphone_button.cc b/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
-index 1a1edb6321490fdbf5cd347cb3d2cb9a6a5b1080..1e959cf1c8fe356ab4427e4bf4f8da1028f4575f 100644
---- a/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
-+++ b/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
-@@ -6,7 +6,7 @@
-
- #include "chrome/browser/ui/color/chrome_color_id.h"
- #include "chrome/browser/ui/views/overlay/constants.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "components/vector_icons/vector_icons.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
-diff --git a/chrome/browser/ui/views/overlay/track_image_button.cc b/chrome/browser/ui/views/overlay/track_image_button.cc
-index 5e136488b37887e9523ac04a9ff4ccdfaf96c104..24899f4c2b6fe66b96a6728bf747f1aad66f20a9 100644
---- a/chrome/browser/ui/views/overlay/track_image_button.cc
-+++ b/chrome/browser/ui/views/overlay/track_image_button.cc
-@@ -6,7 +6,7 @@
-
- #include "chrome/app/vector_icons/vector_icons.h"
- #include "chrome/browser/ui/color/chrome_color_id.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "components/vector_icons/vector_icons.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
-index 6d2744b673ecb31464d4aa9b0d11177892c030f4..f9ea66415b85ce385be429ead5e04c8a96dc31c4 100644
+index 6d2744b673ecb31464d4aa9b0d11177892c030f4..1dd75ec581ecd67e04a8f1cf1e43bce70eaa9380 100644
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
@@ -15,9 +15,11 @@
@@ -298,18 +153,6 @@ index 6d2744b673ecb31464d4aa9b0d11177892c030f4..f9ea66415b85ce385be429ead5e04c8a
#include "chrome/browser/ui/color/chrome_color_id.h"
#include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
#include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
-@@ -29,10 +31,10 @@
- #include "chrome/browser/ui/views/overlay/toggle_camera_button.h"
- #include "chrome/browser/ui/views/overlay/toggle_microphone_button.h"
- #include "chrome/browser/ui/views/overlay/track_image_button.h"
--#include "chrome/grit/generated_resources.h"
- #include "components/vector_icons/vector_icons.h"
- #include "content/public/browser/video_picture_in_picture_window_controller.h"
- #include "content/public/browser/web_contents.h"
-+#include "electron/grit/electron_resources.h"
- #include "media/base/media_switches.h"
- #include "media/base/video_util.h"
- #include "third_party/skia/include/core/SkColor.h"
@@ -56,7 +58,7 @@
#include "ui/aura/window.h"
#endif
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index 5b18830b6f0ed..877c4e12eaa0d 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -69,7 +69,7 @@ index 650c78f16c812170aeda99d75300ff88f47347a0..c33ce445a23f97a744db3a4ac30ef471
NEW_DOC,
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index b11b8f34cf7e252a8d22e167d6555f3aa432e5c4..a5950a9d4c823e3df145c365bb499c0163fe3e77 100644
+index b11b8f34cf7e252a8d22e167d6555f3aa432e5c4..3a42aa2a6cde698a75349e573a34b1328fc9c11c 100644
--- a/chrome/browser/printing/print_job_worker.cc
+++ b/chrome/browser/printing/print_job_worker.cc
@@ -20,7 +20,6 @@
@@ -84,7 +84,7 @@ index b11b8f34cf7e252a8d22e167d6555f3aa432e5c4..a5950a9d4c823e3df145c365bb499c01
#include "content/public/browser/global_routing_id.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
-+#include "electron/grit/electron_resources.h"
++#include "chrome/grit/generated_resources.h"
#include "printing/backend/print_backend.h"
#include "printing/buildflags/buildflags.h"
#include "printing/mojom/print.mojom.h"
@@ -127,7 +127,7 @@ index 56232bf979e90a01bb580c0a1972ae0860d994e9..96e05b5cd4b556a6ddb41664b5ff999b
void PrintJobWorkerOop::UnregisterServiceManagerClient() {
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..abd7e5e5832919cbd06b3b337f54d79d284a4247 100644
+index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a89f5489f 100644
--- a/chrome/browser/printing/print_view_manager_base.cc
+++ b/chrome/browser/printing/print_view_manager_base.cc
@@ -30,10 +30,10 @@
@@ -147,7 +147,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..abd7e5e5832919cbd06b3b337f54d79d
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
-+#include "electron/grit/electron_resources.h"
++#include "chrome/grit/generated_resources.h"
#include "mojo/public/cpp/system/buffer.h"
#include "printing/buildflags/buildflags.h"
#include "printing/metafile_skia.h"
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index e317682535ac0..6db8fbec2119b 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -54,7 +54,6 @@
#include "content/public/common/url_constants.h"
#include "crypto/crypto_buildflags.h"
#include "electron/buildflags/buildflags.h"
-#include "electron/grit/electron_resources.h"
#include "electron/shell/common/api/api.mojom.h"
#include "extensions/browser/api/messaging/messaging_api_message_filter.h"
#include "mojo/public/cpp/bindings/binder_map.h"
diff --git a/shell/browser/extensions/electron_extension_system.cc b/shell/browser/extensions/electron_extension_system.cc
index 20c2cf546ea52..2d757a3e99401 100644
--- a/shell/browser/extensions/electron_extension_system.cc
+++ b/shell/browser/extensions/electron_extension_system.cc
@@ -15,6 +15,7 @@
#include "base/path_service.h"
#include "base/task/post_task.h"
#include "chrome/common/chrome_paths.h"
+#include "chrome/grit/browser_resources.h"
#include "components/value_store/value_store_factory_impl.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_task_traits.h"
@@ -23,7 +24,6 @@
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
#include "electron/buildflags/buildflags.h"
-#include "electron/grit/electron_resources.h"
#include "extensions/browser/api/app_runtime/app_runtime_api.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/info_map.h"
diff --git a/shell/browser/file_select_helper.cc b/shell/browser/file_select_helper.cc
index 6980915f6358b..dbd8b341fb673 100644
--- a/shell/browser/file_select_helper.cc
+++ b/shell/browser/file_select_helper.cc
@@ -22,6 +22,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/platform_util.h"
#include "chrome/common/pref_names.h"
+#include "chrome/grit/generated_resources.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
@@ -31,7 +32,6 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/web_contents.h"
-#include "electron/grit/electron_resources.h"
#include "net/base/filename_util.h"
#include "net/base/mime_util.h"
#include "shell/browser/api/electron_api_web_contents.h"
diff --git a/shell/browser/hid/hid_chooser_context.cc b/shell/browser/hid/hid_chooser_context.cc
index a743048f336f8..ca793e6ff22dc 100644
--- a/shell/browser/hid/hid_chooser_context.cc
+++ b/shell/browser/hid/hid_chooser_context.cc
@@ -13,10 +13,10 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
+#include "chrome/grit/generated_resources.h"
#include "components/content_settings/core/common/content_settings_types.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/device_service.h"
-#include "electron/grit/electron_resources.h"
#include "services/device/public/cpp/hid/hid_blocklist.h"
#include "services/device/public/cpp/hid/hid_switches.h"
#include "shell/browser/web_contents_permission_helper.h"