Chromium Code Reviews| Index: remoting/host/it2me/it2me_native_messaging_host_main.cc |
| diff --git a/remoting/host/it2me/it2me_native_messaging_host_main.cc b/remoting/host/it2me/it2me_native_messaging_host_main.cc |
| index bc892118588678532c4b77740250237535545b93..e0f93490d9cc945e91d60e99124fa8df8c94b680 100644 |
| --- a/remoting/host/it2me/it2me_native_messaging_host_main.cc |
| +++ b/remoting/host/it2me/it2me_native_messaging_host_main.cc |
| @@ -23,6 +23,8 @@ |
| #if defined(OS_LINUX) |
| #include <gtk/gtk.h> |
| #include <X11/Xlib.h> |
| + |
| +#include "base/linux_util.h" |
| #endif // defined(OS_LINUX) |
| #if defined(OS_MACOSX) |
| @@ -73,6 +75,10 @@ int StartIt2MeNativeMessagingHost() { |
| // Continue windows. Calling with nullptr arguments because we don't have |
| // any command line arguments for gtk to consume. |
| gtk_init(nullptr, nullptr); |
| + |
| + // Need to prime the host OS version value for linux to prevent IO on the |
| + // network thread. base::GetLinuxDistro() caches the result. |
| + base::GetLinuxDistro(); |
|
Lambros
2015/11/23 22:44:48
Is this related to this CL ?
Sergey Ulanov
2015/11/23 22:59:44
Right. I had to add it to make it possible to test
|
| #endif // OS_LINUX |
| // Enable support for SSL server sockets, which must be done while still |