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

fix: Revert "fix: don't propagate GDK_BACKEND to subprocs (#28898)" (#29610)

Browse source 
This reverts commit 7b169c2884.
This commit is contained in:
Samuel Attard 2021-06-09 08:28:52 -07:00 • committed by GitHub
parent c252deb878
commit fa0323a3db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

17
shell/browser/electron_browser_main_parts.cc
View file

@ -155,7 +155,6 @@ std::u16string MediaStringProvider(media::MessageId id) {
}
#if defined(OS_LINUX)
void OverrideLinuxAppDataPath() {
base::FilePath path;
if (base::PathService::Get(DIR_APP_DATA, &path))
@ -376,24 +375,8 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
fake_browser_process_->PostDestroyThreads();
}
#if defined(OS_LINUX)
// static
base::Optional<std::string>& ElectronBrowserMainParts::GetGDKBackend() {
static base::Optional<std::string> gdk_backend;
return gdk_backend;
}
#endif
void ElectronBrowserMainParts::ToolkitInitialized() {
#if defined(OS_LINUX)
// This is set by Chromium here:
// https://chromium-review.googlesource.com/c/chromium/src/+/2586184
// and can detrimentally affect external app behaviors, so we want to
// check if the user has set it so we can use it later.
std::string backend;
if (base::Environment::Create()->GetVar("GDK_BACKEND", &backend))
GetGDKBackend().reset(backend);
auto linux_ui = BuildGtkUi();
linux_ui->Initialize();