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 | 16 |
1 files changed, 8 insertions, 8 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 4773f4846b88..65db5a7293fb 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 2020-03-16 18:40:33 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2020-05-13 18:40:33 UTC +++ remoting/host/remoting_me2me_host.cc @@ -118,13 +118,13 @@ #include "remoting/host/mac/permission_utils.h" @@ -39,7 +39,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif -@@ -582,10 +582,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm +@@ -579,10 +579,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm enable_window_capture_ = cmd_line->HasSwitch(kWindowIdSwitchName); if (enable_window_capture_) { @@ -52,7 +52,7 @@ // uint32_t is large enough to hold window IDs on all platforms. uint32_t window_id; -@@ -780,7 +780,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -777,7 +777,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -61,7 +61,7 @@ if (!cert_watcher_) { cert_watcher_.reset(new CertificateWatcher( base::Bind(&HostProcess::ShutdownHost, this, kSuccessExitCode), -@@ -866,7 +866,7 @@ void HostProcess::StartOnUiThread() { +@@ -863,7 +863,7 @@ void HostProcess::StartOnUiThread() { base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::Bind(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -70,7 +70,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()-> -@@ -875,7 +875,7 @@ void HostProcess::StartOnUiThread() { +@@ -872,7 +872,7 @@ void HostProcess::StartOnUiThread() { remoting::AudioCapturerLinux::InitializePipeReader( context_->audio_task_runner(), audio_pipe_name); } @@ -79,7 +79,7 @@ #if defined(OS_POSIX) base::FilePath security_key_socket_name = -@@ -930,7 +930,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -927,7 +927,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -88,7 +88,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. -@@ -1529,7 +1529,7 @@ void HostProcess::StartHost() { +@@ -1526,7 +1526,7 @@ void HostProcess::StartHost() { host_->AddExtension(std::make_unique<TestEchoExtension>()); // TODO(simonmorris): Get the maximum session duration from a policy. @@ -97,7 +97,7 @@ host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20)); #endif -@@ -1698,7 +1698,7 @@ void HostProcess::OnCrash(const std::string& function_ +@@ -1695,7 +1695,7 @@ void HostProcess::OnCrash(const std::string& function_ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); |