Chromium Code Reviews| Index: remoting/host/remoting_me2me_host.cc |
| =================================================================== |
| --- remoting/host/remoting_me2me_host.cc (revision 275947) |
| +++ remoting/host/remoting_me2me_host.cc (working copy) |
| @@ -98,11 +98,6 @@ |
| #include "remoting/host/pairing_registry_delegate_win.h" |
| #include "remoting/host/win/session_desktop_environment.h" |
| #endif // defined(OS_WIN) |
| - |
| -#if defined(TOOLKIT_GTK) |
| -#include "ui/gfx/gtk_util.h" |
| -#endif // defined(TOOLKIT_GTK) |
| - |
| using remoting::protocol::PairingRegistry; |
| namespace { |
| @@ -1319,12 +1314,12 @@ |
| } |
| int HostProcessMain() { |
| -#if defined(TOOLKIT_GTK) |
| +#if defined(OS_LINUX) |
| // Required for any calls into GTK functions, such as the Disconnect and |
| // Continue windows, though these should not be used for the Me2Me case |
| // (crbug.com/104377). |
| - gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess()); |
| -#endif // TOOLKIT_GTK |
| + gtk_init(NULL, NULL); |
|
Sergey Ulanov
2014/06/10 07:58:38
Please add
#include <gtk/gtk.h>
|
| +#endif |
| // Enable support for SSL server sockets, which must be done while still |
| // single-threaded. |