re-landing r93629

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

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=93629

Review URL: http://codereview.chromium.org/7484006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93686 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 1 deletions

diff --git a/base/message_pump_gtk.h b/base/message_pump_gtk.h
index 72eaafa..5fa21f7 100644
--- a/base/message_pump_gtk.h
+++ b/base/message_pump_gtk.h
@@ -9,6 +9,7 @@
 #include "base/message_pump_glib.h"
 
 typedef union _GdkEvent GdkEvent;
+typedef struct _XDisplay Display;
 
 namespace base {
 
@@ -40,7 +41,7 @@ class MessagePumpDispatcher {
 };
 
 // This class implements a message-pump for dispatching GTK events.
-class MessagePumpGtk : public MessagePumpGlib {
+class BASE_API MessagePumpGtk : public MessagePumpGlib {
  public:
   MessagePumpGtk();
   virtual ~MessagePumpGtk();
@@ -49,6 +50,9 @@ 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;