2020-09-28 02:00:05 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
|
|
|
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
|
2020-10-16 01:30:41 +00:00
|
|
|
index b471f462c1a79be50497e72bfe672bb8fad7e85b..986351b7b0f9fd62c90a2c6c134119f41412b291 100644
|
2020-09-28 02:00:05 +00:00
|
|
|
--- a/chrome/browser/pdf/pdf_extension_util.cc
|
|
|
|
|
+++ b/chrome/browser/pdf/pdf_extension_util.cc
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -8,8 +8,7 @@
|
2020-09-28 02:00:05 +00:00
|
|
|
#include "base/values.h"
|
|
|
|
|
#include "chrome/browser/browser_process.h"
|
|
|
|
|
#include "chrome/common/chrome_content_client.h"
|
|
|
|
|
-#include "chrome/grit/browser_resources.h"
|
2020-10-16 01:30:41 +00:00
|
|
|
-#include "chrome/grit/generated_resources.h"
|
2020-09-28 02:00:05 +00:00
|
|
|
+#include "electron/grit/electron_resources.h"
|
|
|
|
|
#include "components/strings/grit/components_strings.h"
|
|
|
|
|
#include "components/zoom/page_zoom_constants.h"
|
|
|
|
|
#include "pdf/pdf_features.h"
|
|
|
|
|
diff --git a/chrome/browser/printing/printing_service.cc b/chrome/browser/printing/printing_service.cc
|
|
|
|
|
index 2b73b110049b5e8d28b52656bbd2423e18ba07a0..8fd868b39d64c74aa189b8ca3e24c8537d91b1ba 100644
|
|
|
|
|
--- a/chrome/browser/printing/printing_service.cc
|
|
|
|
|
+++ b/chrome/browser/printing/printing_service.cc
|
|
|
|
|
@@ -6,7 +6,7 @@
|
|
|
|
|
|
|
|
|
|
#include "base/no_destructor.h"
|
|
|
|
|
#include "chrome/browser/service_sandbox_type.h"
|
|
|
|
|
-#include "chrome/grit/generated_resources.h"
|
|
|
|
|
+#include "electron/grit/electron_resources.h"
|
|
|
|
|
#include "content/public/browser/service_process_host.h"
|
|
|
|
|
|
|
|
|
|
const mojo::Remote<printing::mojom::PrintingService>& GetPrintingService() {
|
|
|
|
|
diff --git a/chrome/browser/win/icon_reader_service.cc b/chrome/browser/win/icon_reader_service.cc
|
|
|
|
|
index 721e1a863cc6925908f8343002df056f2373bf0b..10b2a95162541a8ff4d010c7be864f3f41dae378 100644
|
|
|
|
|
--- a/chrome/browser/win/icon_reader_service.cc
|
|
|
|
|
+++ b/chrome/browser/win/icon_reader_service.cc
|
|
|
|
|
@@ -5,7 +5,7 @@
|
|
|
|
|
#include "chrome/browser/win/icon_reader_service.h"
|
|
|
|
|
|
|
|
|
|
#include "chrome/browser/service_sandbox_type.h"
|
|
|
|
|
-#include "chrome/grit/generated_resources.h"
|
|
|
|
|
+#include "electron/grit/electron_resources.h"
|
|
|
|
|
#include "content/public/browser/service_process_host.h"
|
|
|
|
|
|
|
|
|
|
mojo::Remote<chrome::mojom::UtilReadIcon> LaunchIconReaderInstance() {
|
