mirror of
https://git.freebsd.org/ports.git
synced 2025-06-23 05:30:31 -04:00
120 lines
5.5 KiB
C++
120 lines
5.5 KiB
C++
--- remoting/host/remoting_me2me_host.cc.orig 2021-07-15 19:13:43 UTC
|
|
+++ remoting/host/remoting_me2me_host.cc
|
|
@@ -119,7 +119,7 @@
|
|
#include "remoting/host/mac/permission_utils.h"
|
|
#endif // defined(OS_APPLE)
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
|
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "base/linux_util.h"
|
|
@@ -127,7 +127,7 @@
|
|
#include "remoting/host/linux/certificate_watcher.h"
|
|
#include "ui/events/platform/x11/x11_event_source.h"
|
|
#include "ui/gfx/x/xlib_support.h"
|
|
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
|
|
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
|
|
|
#if defined(OS_WIN)
|
|
#include <commctrl.h>
|
|
@@ -162,11 +162,11 @@ const char kApplicationName[] = "chromoting";
|
|
const char kStdinConfigPath[] = "-";
|
|
#endif // !defined(REMOTING_MULTI_PROCESS)
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
|
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
|
// The command line switch used to pass name of the pipe to capture audio on
|
|
// linux.
|
|
const char kAudioPipeSwitchName[] = "audio-pipe-name";
|
|
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
|
|
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
|
|
|
#if defined(OS_POSIX)
|
|
// The command line switch used to pass name of the unix domain socket used to
|
|
@@ -359,7 +359,7 @@ class HostProcess : public ConfigWatcher::Delegate,
|
|
|
|
std::unique_ptr<ChromotingHostContext> context_;
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
|
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
|
// Watch for certificate changes and kill the host when changes occur
|
|
std::unique_ptr<CertificateWatcher> cert_watcher_;
|
|
#endif
|
|
@@ -772,7 +772,7 @@ void HostProcess::CreateAuthenticatorFactory() {
|
|
DCHECK(third_party_auth_config_.token_url.is_valid());
|
|
DCHECK(third_party_auth_config_.token_validation_url.is_valid());
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
|
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
|
if (!cert_watcher_) {
|
|
cert_watcher_ = std::make_unique<CertificateWatcher>(
|
|
base::BindRepeating(&HostProcess::ShutdownHost, this,
|
|
@@ -861,7 +861,7 @@ void HostProcess::StartOnUiThread() {
|
|
base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
|
|
base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this)));
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
|
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
|
// If an audio pipe is specific on the command-line then initialize
|
|
// AudioCapturerLinux to capture from it.
|
|
base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()->
|
|
@@ -870,7 +870,7 @@ void HostProcess::StartOnUiThread() {
|
|
remoting::AudioCapturerLinux::InitializePipeReader(
|
|
context_->audio_task_runner(), audio_pipe_name);
|
|
}
|
|
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
|
|
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
|
|
|
#if defined(OS_POSIX)
|
|
base::FilePath security_key_socket_name =
|
|
@@ -919,7 +919,7 @@ void HostProcess::ShutdownOnUiThread() {
|
|
// It is now safe for the HostProcess to be deleted.
|
|
self_ = nullptr;
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
|
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
|
// Cause the global AudioPipeReader to be freed, otherwise the audio
|
|
// thread will remain in-use and prevent the process from exiting.
|
|
// TODO(wez): DesktopEnvironmentFactory should own the pipe reader.
|
|
@@ -1763,7 +1763,7 @@ void HostProcess::OnCrash(const std::string& function_
|
|
int HostProcessMain() {
|
|
HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
|
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
|
// Initialize Xlib for multi-threaded use, allowing non-Chromium code to
|
|
// use X11 safely (such as the WebRTC capturer, GTK ...)
|
|
x11::InitXlib();
|
|
@@ -1800,7 +1800,7 @@ int HostProcessMain() {
|
|
std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
|
|
net::NetworkChangeNotifier::CreateIfNeeded());
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
|
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
|
// Create an X11EventSource on all UI threads, so the global X11 connection
|
|
// (x11::Connection::Get()) can dispatch X events.
|
|
auto event_source =
|
|
@@ -1809,7 +1809,7 @@ int HostProcessMain() {
|
|
input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() {
|
|
new ui::X11EventSource(x11::Connection::Get());
|
|
}));
|
|
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
|
|
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
|
|
|
// Create & start the HostProcess using these threads.
|
|
// TODO(wez): The HostProcess holds a reference to itself until Shutdown().
|
|
@@ -1822,11 +1822,11 @@ int HostProcessMain() {
|
|
// Run the main (also UI) task executor until the host no longer needs it.
|
|
run_loop.Run();
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
|
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
|
input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() {
|
|
delete ui::X11EventSource::GetInstance();
|
|
}));
|
|
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
|
|
+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
|
|
|
// Block until tasks blocking shutdown have completed their execution.
|
|
base::ThreadPoolInstance::Get()->Shutdown();
|