diff options
Diffstat (limited to 'www/chromium/files/patch-remoting_host_remoting__me2me__host.cc')
| -rw-r--r-- | www/chromium/files/patch-remoting_host_remoting__me2me__host.cc | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc index 2979792e5fe7..26506ebb50d0 100644 --- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,4 +1,4 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2025-08-07 06:57:29 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2025-10-02 04:28:32 UTC +++ remoting/host/remoting_me2me_host.cc @@ -140,7 +140,7 @@ #include "remoting/host/mac/permission_utils.h" @@ -9,7 +9,7 @@ #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> -@@ -150,7 +150,7 @@ +@@ -151,7 +151,7 @@ #endif // defined(REMOTING_USE_X11) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -18,7 +18,7 @@ #include "base/linux_util.h" #include "remoting/host/linux/audio_capturer_linux.h" #include "remoting/host/linux/certificate_watcher.h" -@@ -165,7 +165,7 @@ +@@ -166,7 +166,7 @@ #include "remoting/host/pairing_registry_delegate_win.h" #endif // BUILDFLAG(IS_WIN) @@ -27,7 +27,7 @@ #include "remoting/base/crash/crash_reporting_crashpad.h" #include "remoting/host/host_wtmpdb_logger.h" #endif // BUILDFLAG(IS_LINUX) -@@ -199,7 +199,7 @@ const char kApplicationName[] = "chromoting"; +@@ -200,7 +200,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -45,7 +45,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -513,7 +513,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -510,7 +510,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<FtlEchoMessageListener> ftl_echo_message_listener_; std::unique_ptr<HostEventLogger> host_event_logger_; @@ -54,7 +54,7 @@ std::unique_ptr<HostWtmpdbLogger> host_wtmpdb_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -840,7 +840,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -837,7 +837,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -63,7 +63,7 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -917,7 +917,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -914,7 +914,7 @@ void HostProcess::CreateAuthenticatorFactory() { context_->create_client_cert_store_callback(), service_account_email_, oauth_refresh_token_)); @@ -72,7 +72,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -1059,7 +1059,7 @@ void HostProcess::StartOnUiThread() { +@@ -1052,7 +1052,7 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -81,7 +81,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = -@@ -1138,7 +1138,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1131,7 +1131,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -90,7 +90,7 @@ // 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. -@@ -1146,7 +1146,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1139,7 +1139,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -99,7 +99,16 @@ context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1929,7 +1929,7 @@ void HostProcess::StartHost() { +@@ -1835,7 +1835,7 @@ void HostProcess::StartHost() { + + SetState(HOST_STARTED); + +-#if BUILDFLAG(IS_LINUX) && defined(REMOTING_USE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) + if (webrtc::DesktopCapturer::IsRunningUnderWayland()) { + GnomeRemoteDesktopSession::GetInstance()->Init( + base::BindOnce([](base::expected<void, std::string> result) { +@@ -1925,7 +1925,7 @@ void HostProcess::StartHost() { host_->AddExtension(std::make_unique<TestEchoExtension>()); @@ -108,7 +117,7 @@ const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(kEnableWtmpdb)) { host_wtmpdb_logger_ = -@@ -1965,7 +1965,7 @@ void HostProcess::StartHost() { +@@ -1960,7 +1960,7 @@ void HostProcess::StartHost() { // addresses. host_->Start(*host_owner_emails_.begin()); @@ -117,7 +126,7 @@ // For Windows and Mac, ChromotingHostServices connections are handled by // another process, then the message pipe is forwarded to the network process. host_->StartChromotingHostServices(); -@@ -2110,7 +2110,7 @@ int HostProcessMain() { +@@ -2105,7 +2105,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -126,7 +135,7 @@ #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 ...) -@@ -2155,7 +2155,7 @@ int HostProcessMain() { +@@ -2150,7 +2150,7 @@ int HostProcessMain() { return kInitializationFailed; } @@ -135,7 +144,7 @@ // Log and cleanup the crash database. We do this after a short delay so that // the crash database has a chance to be updated properly if we just got // relaunched after a crash. -@@ -2175,7 +2175,7 @@ int HostProcessMain() { +@@ -2170,7 +2170,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); |