aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc')
-rw-r--r--www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc27
1 files changed, 14 insertions, 13 deletions
diff --git a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
index ca1e5dce0129..e0c6c02a18c6 100644
--- a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
+++ b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
@@ -1,35 +1,36 @@
---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2020-02-03 21:52:49 UTC
+--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2020-11-13 06:36:46 UTC
+++ remoting/host/it2me/it2me_native_messaging_host_main.cc
-@@ -29,12 +29,12 @@
+@@ -29,13 +29,13 @@
#include "remoting/host/switches.h"
#include "remoting/host/usage_stats_consent.h"
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
#include <gtk/gtk.h>
#include "base/linux_util.h"
+ #include "ui/events/platform/x11/x11_event_source.h"
#include "ui/gfx/x/x11.h"
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- #if defined(OS_MACOSX)
+ #if defined(OS_APPLE)
#include "base/mac/mac_util.h"
-@@ -112,7 +112,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
+@@ -113,7 +113,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
remoting::LoadResources("");
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
// Required in order for us to run multiple X11 threads.
XInitThreads();
-@@ -128,7 +128,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
+@@ -134,7 +134,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
// Need to prime the host OS version value for linux to prevent IO on the
// network thread. base::GetLinuxDistro() caches the result.
base::GetLinuxDistro();
--#endif // OS_LINUX
-+#endif // OS_LINUX || OS_BSD
+-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
base::File read_file;
base::File write_file;