1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
--- electron/shell/browser/electron_browser_main_parts.cc.orig 2021-10-11 17:12:26 UTC
+++ electron/shell/browser/electron_browser_main_parts.cc
@@ -56,7 +56,7 @@
#include "ui/wm/core/wm_state.h"
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "base/environment.h"
#include "base/nix/xdg_util.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -154,7 +154,7 @@ base::string16 MediaStringProvider(media::MessageId id
}
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
void OverrideLinuxAppDataPath() {
base::FilePath path;
if (base::PathService::Get(DIR_APP_DATA, &path))
@@ -182,7 +182,7 @@ void UpdateDarkThemeSetting() {
} // namespace
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
class DarkThemeObserver : public ui::NativeThemeObserver {
public:
DarkThemeObserver() = default;
@@ -230,7 +230,7 @@ int ElectronBrowserMainParts::GetExitCode() {
int ElectronBrowserMainParts::PreEarlyInitialization() {
field_trial_list_ = std::make_unique<base::FieldTrialList>(nullptr);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
OverrideLinuxAppDataPath();
#endif
@@ -287,7 +287,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
#if defined(USE_AURA)
display::Screen* screen = views::CreateDesktopScreen();
display::Screen::SetScreenInstance(screen);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
views::LinuxUI::instance()->UpdateDeviceScaleFactor();
#endif
#endif
@@ -304,7 +304,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
// happen before the ResourceBundle is loaded
if (locale.empty())
l10n_util::OverrideLocaleWithCocoaLocale();
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
// l10n_util::GetApplicationLocaleInternal uses g_get_language_names(),
// which keys off of getenv("LC_ALL").
// We must set this env first to make ui::ResourceBundle accept the custom
@@ -327,7 +327,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
ElectronBrowserClient::SetApplicationLocale(app_locale);
fake_browser_process_->SetApplicationLocale(app_locale);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// Reset to the original LC_ALL since we should not be changing it.
if (!locale.empty()) {
if (lc_all)
@@ -382,7 +382,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() {
ui::GtkUiDelegate::SetInstance(gtk_ui_delegate_.get());
}
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
views::LinuxUI* linux_ui = BuildGtkUi(ui::GtkUiDelegate::instance());
views::LinuxUI::SetInstance(linux_ui);
linux_ui->Initialize();
|
