summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2013-09-20 15:01:41 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2013-11-06 17:30:42 +0100
commit63f1510d708ce6e90354c63655fa21bd4906e52e (patch)
tree6379f5831c4bfefec7a63b2f2a02f44f38af3801
parentaee1bf50ed6733635ac6ae7389657a4563a8a7f7 (diff)
downloadqtwebengine-chromium-63f1510d708ce6e90354c63655fa21bd4906e52e.tar.gz
Hide the definition of MessagePumpGtk::GetDefaultXDisplay.
Change-Id: I3bcee32bcdaab3fe43dc02a66cac295bb1c6386e Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
-rw-r--r--chromium/base/message_loop/message_pump_gtk.cc4
1 files changed, 4 insertions, 0 deletions
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));