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 | 22 |
1 files changed, 11 insertions, 11 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 425214016736..8f6c544769a1 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-01-18 21:29:02 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2021-03-12 23:57:28 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -118,14 +118,14 @@ +@@ -120,14 +120,14 @@ #include "remoting/host/mac/permission_utils.h" #endif // defined(OS_APPLE) @@ -17,7 +17,7 @@ #if defined(OS_WIN) #include <commctrl.h> -@@ -160,11 +160,11 @@ const char kApplicationName[] = "chromoting"; +@@ -162,11 +162,11 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -31,7 +31,7 @@ #if defined(OS_POSIX) // The command line switch used to pass name of the unix domain socket used to -@@ -362,7 +362,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -359,7 +359,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -40,7 +40,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif -@@ -763,7 +763,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -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()); @@ -49,7 +49,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, this, -@@ -850,7 +850,7 @@ void HostProcess::StartOnUiThread() { +@@ -861,7 +861,7 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -58,7 +58,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()-> -@@ -859,7 +859,7 @@ void HostProcess::StartOnUiThread() { +@@ -870,7 +870,7 @@ void HostProcess::StartOnUiThread() { remoting::AudioCapturerLinux::InitializePipeReader( context_->audio_task_runner(), audio_pipe_name); } @@ -67,7 +67,7 @@ #if defined(OS_POSIX) base::FilePath security_key_socket_name = -@@ -908,7 +908,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -919,7 +919,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -76,16 +76,16 @@ // 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. -@@ -1547,7 +1547,7 @@ void HostProcess::StartHost() { +@@ -1591,7 +1591,7 @@ void HostProcess::StartHost() { host_->AddExtension(std::make_unique<TestEchoExtension>()); - // TODO(simonmorris): Get the maximum session duration from a policy. + // TODO(joedow): Remove in M90. -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20)); #endif -@@ -1722,7 +1722,7 @@ void HostProcess::OnCrash(const std::string& function_ +@@ -1768,7 +1768,7 @@ void HostProcess::OnCrash(const std::string& function_ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); |