mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

refactor: run Windows SelectFileDialog out of process (#42780)

Browse source
This commit is contained in:
trop[bot] 2024-07-08 10:31:10 +02:00 committed by GitHub
parent 0a73b80127
commit 8d1b4652ff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
chromium_src/BUILD.gn
View file

@ -156,9 +156,13 @@ static_library("chrome") {
"//chrome/browser/ui/frame/window_frame_util.h", "//chrome/browser/ui/frame/window_frame_util.h",
"//chrome/browser/win/chrome_process_finder.cc", "//chrome/browser/win/chrome_process_finder.cc",
"//chrome/browser/win/chrome_process_finder.h", "//chrome/browser/win/chrome_process_finder.h",
"//chrome/browser/win/chrome_select_file_dialog_factory.cc",
"//chrome/browser/win/chrome_select_file_dialog_factory.h",
"//chrome/browser/win/titlebar_config.cc", "//chrome/browser/win/titlebar_config.cc",
"//chrome/browser/win/titlebar_config.h", "//chrome/browser/win/titlebar_config.h",
"//chrome/browser/win/titlebar_config.h", "//chrome/browser/win/titlebar_config.h",
"//chrome/browser/win/util_win_service.cc",
"//chrome/browser/win/util_win_service.h",
"//chrome/child/v8_crashpad_support_win.cc", "//chrome/child/v8_crashpad_support_win.cc",
"//chrome/child/v8_crashpad_support_win.h", "//chrome/child/v8_crashpad_support_win.h",
] ]
@ -241,6 +245,7 @@ static_library("chrome") {
"//components/webapps/common:mojo_bindings", "//components/webapps/common:mojo_bindings",
] ]
deps += [ deps += [
"//chrome/services/util_win/public/mojom",
"//components/compose/core/browser:mojo_bindings", "//components/compose/core/browser:mojo_bindings",
"//components/segmentation_platform/public/proto", "//components/segmentation_platform/public/proto",
] ]

6
shell/browser/electron_browser_main_parts.cc
View file

@ -96,6 +96,7 @@
#endif #endif
#if BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN)
#include "chrome/browser/win/chrome_select_file_dialog_factory.h"
#include "ui/base/l10n/l10n_util_win.h" #include "ui/base/l10n/l10n_util_win.h"
#include "ui/gfx/system_fonts_win.h" #include "ui/gfx/system_fonts_win.h"
#include "ui/strings/grit/app_locale_settings.h" #include "ui/strings/grit/app_locale_settings.h"
@ -484,6 +485,11 @@ int ElectronBrowserMainParts::PreMainMessageLoopRun() {
fake_browser_process_->PreMainMessageLoopRun(); fake_browser_process_->PreMainMessageLoopRun();
#if BUILDFLAG(IS_WIN)
ui::SelectFileDialog::SetFactory(
std::make_unique<ChromeSelectFileDialogFactory>());
#endif
return GetExitCode(); return GetExitCode();
} }

6
shell/utility/electron_content_utility_client.cc
View file

@ -20,7 +20,9 @@
#if BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN)
#include "chrome/services/util_win/public/mojom/util_read_icon.mojom.h" #include "chrome/services/util_win/public/mojom/util_read_icon.mojom.h"
#include "chrome/services/util_win/public/mojom/util_win.mojom.h"
#include "chrome/services/util_win/util_read_icon.h" #include "chrome/services/util_win/util_read_icon.h"
#include "chrome/services/util_win/util_win_impl.h"
#endif // BUILDFLAG(IS_WIN) #endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(ENABLE_PRINTING) #if BUILDFLAG(ENABLE_PRINTING)
@ -55,6 +57,9 @@ auto RunWindowsIconReader(
mojo::PendingReceiver<chrome::mojom::UtilReadIcon> receiver) { mojo::PendingReceiver<chrome::mojom::UtilReadIcon> receiver) {
return std::make_unique<UtilReadIcon>(std::move(receiver)); return std::make_unique<UtilReadIcon>(std::move(receiver));
} }
auto RunWindowsUtility(mojo::PendingReceiver<chrome::mojom::UtilWin> receiver) {
return std::make_unique<UtilWinImpl>(std::move(receiver));
}
#endif #endif
#if BUILDFLAG(ENABLE_PRINTING) #if BUILDFLAG(ENABLE_PRINTING)
@ -109,6 +114,7 @@ void ElectronContentUtilityClient::RegisterMainThreadServices(
mojo::ServiceFactory& services) { mojo::ServiceFactory& services) {
#if BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN)
services.Add(RunWindowsIconReader); services.Add(RunWindowsIconReader);
services.Add(RunWindowsUtility);
#endif #endif
#if BUILDFLAG(ENABLE_PRINTING) #if BUILDFLAG(ENABLE_PRINTING)