diff options
Diffstat (limited to 'devel/electron35/files/patch-remoting_host_remoting__me2me__host.cc')
| -rw-r--r-- | devel/electron35/files/patch-remoting_host_remoting__me2me__host.cc | 160 |
1 files changed, 0 insertions, 160 deletions
diff --git a/devel/electron35/files/patch-remoting_host_remoting__me2me__host.cc b/devel/electron35/files/patch-remoting_host_remoting__me2me__host.cc deleted file mode 100644 index c096efaddbfa..000000000000 --- a/devel/electron35/files/patch-remoting_host_remoting__me2me__host.cc +++ /dev/null @@ -1,160 +0,0 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2025-03-24 20:50:14 UTC -+++ remoting/host/remoting_me2me_host.cc -@@ -145,7 +145,7 @@ - #include "remoting/host/mac/permission_utils.h" - #endif // BUILDFLAG(IS_APPLE) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #if defined(REMOTING_USE_X11) - #include <gtk/gtk.h> - #endif // defined(REMOTING_USE_X11) -@@ -156,13 +156,13 @@ - #endif // defined(REMOTING_USE_X11) - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "base/linux_util.h" - #include "remoting/host/linux/audio_capturer_linux.h" - #include "remoting/host/linux/certificate_watcher.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "remoting/host/host_utmp_logger.h" - #endif - -@@ -176,7 +176,7 @@ - #include "remoting/host/win/session_desktop_environment.h" - #endif // BUILDFLAG(IS_WIN) - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "remoting/host/linux/wayland_manager.h" - #include "remoting/host/linux/wayland_utils.h" - #endif // BUILDFLAG(IS_LINUX) -@@ -204,7 +204,7 @@ const char kStdinConfigPath[] = "-"; - const char kStdinConfigPath[] = "-"; - #endif // !defined(REMOTING_MULTI_PROCESS) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // The command line switch used to pass name of the pipe to capture audio on - // linux. - const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -448,7 +448,7 @@ class HostProcess : public ConfigWatcher::Delegate, - std::unique_ptr<AgentProcessBrokerClient> agent_process_broker_client_; - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Watch for certificate changes and kill the host when changes occur - std::unique_ptr<CertificateWatcher> cert_watcher_; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -510,7 +510,7 @@ class HostProcess : public ConfigWatcher::Delegate, - std::unique_ptr<FtlEchoMessageListener> ftl_echo_message_listener_; - - std::unique_ptr<HostEventLogger> host_event_logger_; --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - std::unique_ptr<HostUTMPLogger> host_utmp_logger_; - #endif - std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -828,7 +828,7 @@ void HostProcess::ShutdownOnNetworkThread() { - void HostProcess::ShutdownOnNetworkThread() { - DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); - config_watcher_.reset(); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - cert_watcher_.reset(); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - } -@@ -899,7 +899,7 @@ void HostProcess::CreateAuthenticatorFactory() { - context_->url_loader_factory(), service_account_email_, - oauth_refresh_token_)); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (!cert_watcher_) { - cert_watcher_ = std::make_unique<CertificateWatcher>( - base::BindRepeating(&HostProcess::ShutdownHost, -@@ -1041,13 +1041,13 @@ void HostProcess::StartOnUiThread() { - base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), - base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (IsRunningWayland()) { - WaylandManager::Get()->Init(context_->ui_task_runner()); - } - #endif // BUILDFLAG(IS_LINUX) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // If an audio pipe is specific on the command-line then initialize - // AudioCapturerLinux to capture from it. - base::FilePath audio_pipe_name = -@@ -1124,7 +1124,7 @@ void HostProcess::ShutdownOnUiThread() { - // It is now safe for the HostProcess to be deleted. - self_ = nullptr; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_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. -@@ -1132,7 +1132,7 @@ void HostProcess::ShutdownOnUiThread() { - AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) - context_->input_task_runner()->PostTask( - FROM_HERE, - base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1844,7 +1844,7 @@ void HostProcess::StartHost() { - corp_host_status_logger_->StartObserving(*session_manager); - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - desktop_environment_options_.set_enable_remote_webauthn(is_corp_host_); - #endif - #if BUILDFLAG(IS_WIN) -@@ -1871,7 +1871,7 @@ void HostProcess::StartHost() { - - host_->AddExtension(std::make_unique<TestEchoExtension>()); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); - if (cmd_line->HasSwitch(kEnableUtempter)) { - host_utmp_logger_ = -@@ -1907,7 +1907,7 @@ void HostProcess::StartHost() { - // addresses. - host_->Start(*host_owner_emails_.begin()); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // For Windows, ChromotingHostServices connections are handled by the daemon - // process, then the message pipe is forwarded to the network process. - host_->StartChromotingHostServices(); -@@ -2051,7 +2051,7 @@ int HostProcessMain() { - HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); - const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #if defined(REMOTING_USE_X11) - // Initialize Xlib for multi-threaded use, allowing non-Chromium code to - // use X11 safely (such as the WebRTC capturer, GTK ...) -@@ -2100,7 +2100,7 @@ int HostProcessMain() { - std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( - net::NetworkChangeNotifier::CreateIfNeeded()); - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) - // Create an X11EventSource on all UI threads, so the global X11 connection - // (x11::Connection::Get()) can dispatch X events. - auto event_source = |