Index: remoting/host/remoting_me2me_host.cc |
=================================================================== |
--- remoting/host/remoting_me2me_host.cc (revision 275947) |
+++ remoting/host/remoting_me2me_host.cc (working copy) |
@@ -11,7 +11,6 @@ |
#include "base/callback.h" |
#include "base/command_line.h" |
#include "base/debug/alias.h" |
-#include "base/file_util.h" |
#include "base/files/file_path.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/message_loop/message_loop.h" |
@@ -99,10 +98,6 @@ |
#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,13 +1314,6 @@ |
} |
int HostProcessMain() { |
-#if defined(TOOLKIT_GTK) |
Sergey Ulanov
2014/06/10 05:29:39
This needs to changed to OS_LINUX, but we don't wo
Lei Zhang
2014/06/10 05:38:39
but ui/gfx/gtk_util.h doesn't exist anymore and gf
Sergey Ulanov
2014/06/10 06:05:55
We can't depend on src/chrome here. Please replace
Lei Zhang
2014/06/10 07:02:28
Done.
|
- // 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 |
- |
// Enable support for SSL server sockets, which must be done while still |
// single-threaded. |
net::EnableSSLServerSockets(); |