From 4fc055fe9ff8a82ddf6df5402401247f3b86a0d3 Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Mon, 24 Mar 2014 18:36:43 +0100
Subject: <chromium> Hide the definition of MessagePumpX11::GetDefaultXDisplay

This should replace patch 0011 since we do not build GTK code any more.

Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Change-Id: I08ba240fd24e2bd644229458a316fb5886dbd82b
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
---
 chromium/base/message_loop/message_pump_x11.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/chromium/base/message_loop/message_pump_x11.cc b/chromium/base/message_loop/message_pump_x11.cc
index 35dcc040348..001775c5d00 100644
--- a/chromium/base/message_loop/message_pump_x11.cc
+++ b/chromium/base/message_loop/message_pump_x11.cc
@@ -141,12 +141,15 @@ 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
-- 
cgit v1.2.1