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

use_electron_resources_in_icon_reader_service.patch 959 B
History Raw

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

  2. From: Deepak Mohan <[email protected]>
    3. 

  3. Date: Wed, 24 Jun 2020 21:00:00 -0700
    4. 

  4. Subject: use electron resources in icon_reader_service
    5. 

  5. 

  6. Without this, the ID for IDS_UTILITY_PROCESS_UTILITY_WIN_NAME will be wrong on windows
    7. 

  7. and cause a DCHECK() failure
    8. 

  8. 

  9. diff --git a/chrome/browser/win/icon_reader_service.cc b/chrome/browser/win/icon_reader_service.cc
    10. 

  10. index 721e1a863cc6925908f8343002df056f2373bf0b..10b2a95162541a8ff4d010c7be864f3f41dae378 100644
    11. 

  11. --- a/chrome/browser/win/icon_reader_service.cc
    12. 

  12. +++ b/chrome/browser/win/icon_reader_service.cc
    13. 

  13. @@ -5,7 +5,7 @@
    14. 

  14.  #include "chrome/browser/win/icon_reader_service.h"
    15. 

  15.  
    16. 

  16.  #include "chrome/browser/service_sandbox_type.h"
    17. 

  17. -#include "chrome/grit/generated_resources.h"
    18. 

  18. +#include "electron/grit/electron_resources.h"
    19. 

  19.  #include "content/public/browser/service_process_host.h"
    20. 

  20.  
    21. 

  21.  mojo::Remote<chrome::mojom::UtilReadIcon> LaunchIconReaderInstance() {
    22.