gtk: Allow building both the X11 and Gtk message-pumps for gtk.

base/message_loop/message_pump_x11.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_MESSAGE_LOOP_MESSAGE_PUMP_AURAX11_H
-#define BASE_MESSAGE_LOOP_MESSAGE_PUMP_AURAX11_H
+#ifndef BASE_MESSAGE_LOOP_MESSAGE_PUMP_X11_H
+#define BASE_MESSAGE_LOOP_MESSAGE_PUMP_X11_H
 
 #include <bitset>
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_pump.h"
 #include "base/message_loop/message_pump_dispatcher.h"
 #include "base/message_loop/message_pump_glib.h"
 #include "base/message_loop/message_pump_observer.h"
 #include "base/observer_list.h"
 
 // It would be nice to include the X11 headers here so that we use Window
 // instead of its typedef of unsigned long, but we can't because everything in
 // chrome includes us through base/message_loop/message_loop.h, and X11's crappy
 // #define heavy headers muck up half of chrome.
 
 typedef struct _GPollFD GPollFD;
 typedef struct _GSource GSource;
 typedef struct _XDisplay Display;
 
 namespace base {
 
 // This class implements a message-pump for dispatching X events.
 //
 // If there's a current dispatcher given through RunWithDispatcher(), that
 // dispatcher receives events. Otherwise, we route to messages to dispatchers
 // who have subscribed to messages from a specific X11 window.
-class BASE_EXPORT MessagePumpAuraX11 : public MessagePumpGlib,
-                                       public MessagePumpDispatcher {
+class BASE_EXPORT MessagePumpX11 : public MessagePumpGlib,
+                                   public MessagePumpDispatcher {
  public:
-  MessagePumpAuraX11();
-  virtual ~MessagePumpAuraX11();
+  MessagePumpX11();
+  virtual ~MessagePumpX11();
 
   // Returns default X Display.
   static Display* GetDefaultXDisplay();
 
   // Returns true if the system supports XINPUT2.
   static bool HasXInput2();
 
+#if !defined(TOOLKIT_GTK)
   // Returns the UI message pump.
-  static MessagePumpAuraX11* Current();
+  static MessagePumpX11* Current();
+#endif
 
   // Adds/Removes |dispatcher| for the |xid|. This will route all messages from
   // the window |xid| to |dispatcher.
   void AddDispatcherForWindow(MessagePumpDispatcher* dispatcher,
                               unsigned long xid);
   void RemoveDispatcherForWindow(unsigned long xid);
 
   // Adds/Removes |dispatcher| to receive all events sent to the X root
   // window. A root window can have multiple dispatchers, and events on root
   // windows will be dispatched to all.
@@ skipping 57 matching lines @@
   // Dispatch calls can cause addition of new dispatchers as we iterate
   // through them. Use ObserverList to ensure the iterator remains valid across
   // additions.
   ObserverList<MessagePumpDispatcher> root_window_dispatchers_;
 
   // List of observers.
   ObserverList<MessagePumpObserver> observers_;
 
   unsigned long x_root_window_;
 
-  DISALLOW_COPY_AND_ASSIGN(MessagePumpAuraX11);
+  DISALLOW_COPY_AND_ASSIGN(MessagePumpX11);
 };
 
-typedef MessagePumpAuraX11 MessagePumpForUI;
+#if !defined(TOOLKIT_GTK)
+typedef MessagePumpX11 MessagePumpForUI;
+#endif
 
 }  // namespace base
 
-#endif  // BASE_MESSAGE_LOOP_MESSAGE_PUMP_AURAX11_H
+#endif  // BASE_MESSAGE_LOOP_MESSAGE_PUMP_X11_H