blob: 06b6816dd7c8d0a8454ff37a3fb52c1157a5ec34 (
plain) (
blame)
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
|
--- chrome/browser/chrome_browser_main_linux.cc.orig 2024-10-16 21:30:57 UTC
+++ chrome/browser/chrome_browser_main_linux.cc
@@ -25,7 +25,7 @@
#include "device/bluetooth/dbus/bluez_dbus_thread_manager.h"
#include "ui/base/l10n/l10n_util.h"
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/ozone/public/ozone_platform.h"
#endif
@@ -84,7 +84,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
#endif // BUILDFLAG(IS_CHROMEOS)
#if !BUILDFLAG(IS_CHROMEOS)
+#if !BUILDFLAG(IS_BSD)
bluez::BluezDBusManager::Initialize(nullptr /* system_bus */);
+#endif
// Set up crypt config. This needs to be done before anything starts the
// network service, as the raw encryption key needs to be shared with the
@@ -110,7 +112,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop();
}
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
@@ -170,7 +172,7 @@ void ChromeBrowserMainPartsLinux::PostDestroyThreads()
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
-#if BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// No-op; per PostBrowserStart() comment, this is done elsewhere.
#else
bluez::BluezDBusManager::Shutdown();
|
