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 | 35 |
1 files changed, 13 insertions, 22 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 ffa8b64aa446..ac6b069355a7 100644 --- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2021-09-24 04:26:09 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2021-12-31 00:57:37 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -118,7 +118,7 @@ +@@ -124,7 +124,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // defined(OS_APPLE) @@ -9,7 +9,7 @@ #include <gtk/gtk.h> #include "base/linux_util.h" -@@ -126,7 +126,7 @@ +@@ -132,7 +132,7 @@ #include "remoting/host/linux/certificate_watcher.h" #include "ui/events/platform/x11/x11_event_source.h" #include "ui/gfx/x/xlib_support.h" @@ -18,7 +18,7 @@ #if defined(OS_WIN) #include <commctrl.h> -@@ -162,11 +162,11 @@ const char kApplicationName[] = "chromoting"; +@@ -168,11 +168,11 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -32,7 +32,7 @@ #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, +@@ -367,7 +367,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -41,7 +41,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif -@@ -773,7 +773,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -791,7 +791,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -50,7 +50,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, this, -@@ -862,7 +862,7 @@ void HostProcess::StartOnUiThread() { +@@ -906,7 +906,7 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -59,7 +59,7 @@ // 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()-> -@@ -871,7 +871,7 @@ void HostProcess::StartOnUiThread() { +@@ -915,7 +915,7 @@ void HostProcess::StartOnUiThread() { remoting::AudioCapturerLinux::InitializePipeReader( context_->audio_task_runner(), audio_pipe_name); } @@ -68,7 +68,7 @@ #if defined(OS_POSIX) base::FilePath security_key_socket_name = -@@ -920,7 +920,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -964,7 +964,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -77,16 +77,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. -@@ -1581,7 +1581,7 @@ void HostProcess::StartHost() { - - // Remote open URL is fully supported on Linux and still in development for - // Windows. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - desktop_environment_options_.set_enable_remote_open_url(true); - #elif !defined(NDEBUG) && defined(OS_WIN) - // The modern default apps settings dialog is only available to Windows 8+. -@@ -1771,7 +1771,7 @@ void HostProcess::OnCrash(const std::string& function_ +@@ -1862,7 +1862,7 @@ void HostProcess::CrashHostProcess(const std::string& int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); @@ -95,7 +86,7 @@ // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) x11::InitXlib(); -@@ -1808,7 +1808,7 @@ int HostProcessMain() { +@@ -1899,7 +1899,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); @@ -104,7 +95,7 @@ // Create an X11EventSource on all UI threads, so the global X11 connection // (x11::Connection::Get()) can dispatch X events. auto event_source = -@@ -1817,7 +1817,7 @@ int HostProcessMain() { +@@ -1908,7 +1908,7 @@ int HostProcessMain() { input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { new ui::X11EventSource(x11::Connection::Get()); })); @@ -113,7 +104,7 @@ // Create & start the HostProcess using these threads. // TODO(wez): The HostProcess holds a reference to itself until Shutdown(). -@@ -1830,11 +1830,11 @@ int HostProcessMain() { +@@ -1920,11 +1920,11 @@ int HostProcessMain() { // Run the main (also UI) task executor until the host no longer needs it. run_loop.Run(); |