Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 326043002: Cleanup: Remove more dead GTK code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix accidental revert Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/remoting_me2me_host.cc
===================================================================
--- remoting/host/remoting_me2me_host.cc (revision 277810)
+++ remoting/host/remoting_me2me_host.cc (working copy)
@@ -88,6 +88,7 @@
#endif // defined(OS_MACOSX)
#if defined(OS_LINUX)
+#include <gtk/gtk.h>
#include "remoting/host/audio_capturer_linux.h"
#endif // defined(OS_LINUX)
@@ -98,11 +99,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 {
@@ -1326,12 +1322,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);
+#endif
// Enable support for SSL server sockets, which must be done while still
// single-threaded.
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698