summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2020-04-13 10:37:15 +0000
committerRene Ladan <rene@FreeBSD.org>2020-04-13 10:37:15 +0000
commite3b53fa1271f0ecfc6d650148fa6a2ce7fd59689 (patch)
tree4282b6dacc1a8a20ec4bc04900a236b3e3fb61a0 /www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
parentUpdate java plugin. (diff)
www/chromium: update to 81.0.4044.92
Currently the camera and geolocation do not work. Submitted by: Matthias Wolf Obtained from: https://github.com/gliaskos/freebsd-chromium/pull/173 Obtained from: https://github.com/gliaskos/freebsd-chromium/pull/174 MFH: 2020Q2 Security: https://www.vuxml.org/freebsd/6e3b700a-7ca3-11ea-b594-3065ec8fd3ec.html
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.cc18
1 files changed, 9 insertions, 9 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 a32651ac406f..4773f4846b88 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-03 18:53:55 UTC
+--- remoting/host/remoting_me2me_host.cc.orig 2020-03-16 18:40:33 UTC
+++ remoting/host/remoting_me2me_host.cc
@@ -118,13 +118,13 @@
#include "remoting/host/mac/permission_utils.h"
@@ -30,7 +30,7 @@
#if defined(OS_POSIX)
// The command line switch used to pass name of the unix domain socket used to
-@@ -356,7 +356,7 @@ class HostProcess : public ConfigWatcher::Delegate,
+@@ -357,7 +357,7 @@ class HostProcess : public ConfigWatcher::Delegate,
std::unique_ptr<ChromotingHostContext> context_;
@@ -39,7 +39,7 @@
// Watch for certificate changes and kill the host when changes occur
std::unique_ptr<CertificateWatcher> cert_watcher_;
#endif
-@@ -586,10 +586,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm
+@@ -582,10 +582,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;
-@@ -784,7 +784,7 @@ void HostProcess::CreateAuthenticatorFactory() {
+@@ -780,7 +780,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),
-@@ -870,7 +870,7 @@ void HostProcess::StartOnUiThread() {
+@@ -866,7 +866,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()->
-@@ -879,7 +879,7 @@ void HostProcess::StartOnUiThread() {
+@@ -875,7 +875,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 =
-@@ -934,7 +934,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -930,7 +930,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.
-@@ -1538,7 +1538,7 @@ void HostProcess::StartHost() {
+@@ -1529,7 +1529,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
-@@ -1708,7 +1708,7 @@ void HostProcess::OnCrash(const std::string& function_
+@@ -1698,7 +1698,7 @@ void HostProcess::OnCrash(const std::string& function_
int HostProcessMain() {
HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);