summaryrefslogtreecommitdiffstats
path: root/base/message_pump_gtk.h
diff options
context:
space:
mode:
authorleandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 15:24:04 +0000
committerleandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 15:24:04 +0000
commitbdab20fe8a247e0a3d825507ba4849331c26dfdc (patch)
treebca0a220edd9ac95ef666e4148144d71064c6b7e /base/message_pump_gtk.h
parent6490abc1d558d262e1a4ab2125967a5afd0eb430 (diff)
downloadchromium_src-bdab20fe8a247e0a3d825507ba4849331c26dfdc.zip
chromium_src-bdab20fe8a247e0a3d825507ba4849331c26dfdc.tar.gz
chromium_src-bdab20fe8a247e0a3d825507ba4849331c26dfdc.tar.bz2
Revert 93629 - Linux build failure: http://build.chromium.org/p/chromium/builders/Linux%20Builder%20%28dbg%29%28shared%29/builds/4098/steps/compile/logs/stdio#error1
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 TBR=oshima@google.com Review URL: http://codereview.chromium.org/7493014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93633 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_pump_gtk.h')
-rw-r--r--base/message_pump_gtk.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/base/message_pump_gtk.h b/base/message_pump_gtk.h
index 7e5cf04..72eaafa 100644
--- a/base/message_pump_gtk.h
+++ b/base/message_pump_gtk.h
@@ -9,7 +9,6 @@
#include "base/message_pump_glib.h"
typedef union _GdkEvent GdkEvent;
-typedef struct _XDisplay Display;
namespace base {
@@ -50,9 +49,6 @@ class MessagePumpGtk : public MessagePumpGlib {
// some task before/after calling the default handler (EventDispatcher).
void DispatchEvents(GdkEvent* event);
- // Returns default X Display.
- static Display* GetDefaultXDisplay();
-
private:
// Overridden from MessagePumpGlib
virtual bool RunOnce(GMainContext* context, bool block) OVERRIDE;