diff options
Diffstat (limited to 'chromium/base/message_loop')
-rw-r--r-- | chromium/base/message_loop/message_pump_gtk.cc | 4 | ||||
-rw-r--r-- | chromium/base/message_loop/message_pump_x11.cc | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/chromium/base/message_loop/message_pump_gtk.cc b/chromium/base/message_loop/message_pump_gtk.cc index 6023c1141ed..86d2415a412 100644 --- a/chromium/base/message_loop/message_pump_gtk.cc +++ b/chromium/base/message_loop/message_pump_gtk.cc @@ -79,9 +79,6 @@ void MessagePumpGtk::DispatchEvents(GdkEvent* event) { DidProcessEvent(event); } -// FIXME: Get our own MessagePumpUI to avoid this. -// Comment out this version so that our Qt version in shared_globals.cpp is used. -/* // static Display* MessagePumpGtk::GetDefaultXDisplay() { static GdkDisplay* display = gdk_display_get_default(); @@ -93,7 +90,6 @@ Display* MessagePumpGtk::GetDefaultXDisplay() { } return GDK_DISPLAY_XDISPLAY(display); } -*/ void MessagePumpGtk::AddObserver(MessagePumpGdkObserver* observer) { observers_.AddObserver(observer); diff --git a/chromium/base/message_loop/message_pump_x11.cc b/chromium/base/message_loop/message_pump_x11.cc index 001775c5d00..35dcc040348 100644 --- a/chromium/base/message_loop/message_pump_x11.cc +++ b/chromium/base/message_loop/message_pump_x11.cc @@ -141,15 +141,12 @@ MessagePumpX11::~MessagePumpX11() { g_xdisplay = NULL; } -#if !defined(TOOLKIT_QT) -// Qt uses it's own version. // static Display* MessagePumpX11::GetDefaultXDisplay() { if (!g_xdisplay) g_xdisplay = XOpenDisplay(NULL); return g_xdisplay; } -#endif #if defined(TOOLKIT_GTK) // static |