Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 22a70eb803
Branches Tags
electron
/
patches
/
chromium
/
fix_use_electron_generated_resources.patch

fix_use_electron_generated_resources.patch 2.4 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Shelley Vohr <[email protected]>
    3. 

  3. Date: Thu, 24 Sep 2020 11:10:41 -0700
    4. 

  4. Subject: fix: use electron generated resources
    5. 

  5. 

  6. This patch fixes a few instances where we need to use Electron generated
    7. 

  7. resources for IDS strings, or the IDs will be wrong and cause DCHECKS
    8. 

  8. as they will loaded as empty strings.
    9. 

  9. 

  10. * IDS_UTILITY_PROCESS_UTILITY_WIN_NAME on Windows
    11. 

  11. * IDR_PDF_MANIFEST on Linux
    12. 

  12. * IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME on Windows
    13. 

  13. 

  14. diff --git a/chrome/browser/pdf/pdf_extension_util.cc b/chrome/browser/pdf/pdf_extension_util.cc
    15. 

  15. index f4dd5157210dafc93b40055f1179c730c9809ff3..f9fa3a8146b41f81fe8ec7c6e60f5c257e953387 100644
    16. 

  16. --- a/chrome/browser/pdf/pdf_extension_util.cc
    17. 

  17. +++ b/chrome/browser/pdf/pdf_extension_util.cc
    18. 

  18. @@ -9,8 +9,7 @@
    19. 

  19.  #include "build/chromeos_buildflags.h"
    20. 

  20.  #include "chrome/browser/browser_process.h"
    21. 

  21.  #include "chrome/common/chrome_content_client.h"
    22. 

  22. -#include "chrome/grit/browser_resources.h"
    23. 

  23. -#include "chrome/grit/generated_resources.h"
    24. 

  24. +#include "electron/grit/electron_resources.h"
    25. 

  25.  #include "components/strings/grit/components_strings.h"
    26. 

  26.  #include "components/zoom/page_zoom_constants.h"
    27. 

  27.  #include "pdf/pdf_features.h"
    28. 

  28. diff --git a/chrome/browser/printing/printing_service.cc b/chrome/browser/printing/printing_service.cc
    29. 

  29. index 2b73b110049b5e8d28b52656bbd2423e18ba07a0..8fd868b39d64c74aa189b8ca3e24c8537d91b1ba 100644
    30. 

  30. --- a/chrome/browser/printing/printing_service.cc
    31. 

  31. +++ b/chrome/browser/printing/printing_service.cc
    32. 

  32. @@ -6,7 +6,7 @@
    33. 

  33.  
    34. 

  34.  #include "base/no_destructor.h"
    35. 

  35.  #include "chrome/browser/service_sandbox_type.h"
    36. 

  36. -#include "chrome/grit/generated_resources.h"
    37. 

  37. +#include "electron/grit/electron_resources.h"
    38. 

  38.  #include "content/public/browser/service_process_host.h"
    39. 

  39.  
    40. 

  40.  const mojo::Remote<printing::mojom::PrintingService>& GetPrintingService() {
    41. 

  41. diff --git a/chrome/browser/win/icon_reader_service.cc b/chrome/browser/win/icon_reader_service.cc
    42. 

  42. index 721e1a863cc6925908f8343002df056f2373bf0b..10b2a95162541a8ff4d010c7be864f3f41dae378 100644
    43. 

  43. --- a/chrome/browser/win/icon_reader_service.cc
    44. 

  44. +++ b/chrome/browser/win/icon_reader_service.cc
    45. 

  45. @@ -5,7 +5,7 @@
    46. 

  46.  #include "chrome/browser/win/icon_reader_service.h"
    47. 

  47.  
    48. 

  48.  #include "chrome/browser/service_sandbox_type.h"
    49. 

  49. -#include "chrome/grit/generated_resources.h"
    50. 

  50. +#include "electron/grit/electron_resources.h"
    51. 

  51.  #include "content/public/browser/service_process_host.h"
    52. 

  52.  
    53. 

  53.  mojo::Remote<chrome::mojom::UtilReadIcon> LaunchIconReaderInstance() {
    54.