summaryrefslogtreecommitdiffstats
path: root/base/message_pump_x.h
diff options
context:
space:
mode:
authoroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 15:00:46 +0000
committeroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 15:00:46 +0000
commit39cbe41d48e27c19821c048b4d5d461cf1b8faa8 (patch)
tree01c2e84b45505b9b261cb8dcf8baf529be9d4118 /base/message_pump_x.h
parente071c44a96a1ad7733c87c42f35a706973cb2afc (diff)
downloadchromium_src-39cbe41d48e27c19821c048b4d5d461cf1b8faa8.zip
chromium_src-39cbe41d48e27c19821c048b4d5d461cf1b8faa8.tar.gz
chromium_src-39cbe41d48e27c19821c048b4d5d461cf1b8faa8.tar.bz2
Consolidate access to X Display
Change ui::GetXDisplay to use the MessagePumpForUI class to get Display. This allows us to have two different implementation for x and gtk. Remove MessageLoop::GetDisplay from message loop API. Client should use ui::GetXDisplay instead. This will also be removed in near future, and client should get display from window it is dealing with. BUG=none TEST=none Review URL: http://codereview.chromium.org/7484006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_pump_x.h')
-rw-r--r--base/message_pump_x.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/base/message_pump_x.h b/base/message_pump_x.h
index ecadc1f..8ac9921 100644
--- a/base/message_pump_x.h
+++ b/base/message_pump_x.h
@@ -14,6 +14,7 @@
#include <gtk/gtk.h>
typedef union _XEvent XEvent;
+typedef struct _XDisplay Display;
namespace base {
@@ -74,6 +75,9 @@ class MessagePumpX : public MessagePumpGlib {
// NativeWidgetX is enabled.
static void DisableGtkMessagePump();
+ // Returns default X Display.
+ static Display* GetDefaultXDisplay();
+
private:
// Some XEvent's can't be directly read from X event queue and will go
// through GDK's dispatching process and may get discarded. This function