From 63f1510d708ce6e90354c63655fa21bd4906e52e Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Fri, 20 Sep 2013 15:01:41 +0200 Subject: Hide the definition of MessagePumpGtk::GetDefaultXDisplay. Change-Id: I3bcee32bcdaab3fe43dc02a66cac295bb1c6386e Reviewed-by: Zeno Albisser --- chromium/base/message_loop/message_pump_gtk.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chromium/base/message_loop/message_pump_gtk.cc b/chromium/base/message_loop/message_pump_gtk.cc index ad6511318ab..af596857810 100644 --- a/chromium/base/message_loop/message_pump_gtk.cc +++ b/chromium/base/message_loop/message_pump_gtk.cc @@ -85,6 +85,9 @@ 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(); @@ -96,6 +99,7 @@ Display* MessagePumpGtk::GetDefaultXDisplay() { } return GDK_DISPLAY_XDISPLAY(display); } +*/ void MessagePumpGtk::WillProcessEvent(GdkEvent* event) { FOR_EACH_OBSERVER(MessagePumpObserver, observers(), WillProcessEvent(event)); -- cgit v1.2.1