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"