Merge aura::DispatcherLinux into base::MessagePumpAuraX11.

base/message_pump_glib.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_PUMP_GLIB_H_
 #define BASE_MESSAGE_PUMP_GLIB_H_
 
+#include "base/base_export.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_pump.h"
 #include "base/observer_list.h"
 #include "base/time.h"
 
 typedef struct _GMainContext GMainContext;
 typedef struct _GPollFD GPollFD;
 typedef struct _GSource GSource;
 
 namespace base {
 
 // MessagePumpObserver is notified prior to an event being dispatched. As
 // Observers are notified of every change, they have to be FAST! The platform
 // specific implementation of the class is in message_pump_gtk/message_pump_x.
 class MessagePumpObserver;
 
 // MessagePumpDispatcher is used during a nested invocation of Run to dispatch
 // events. If Run is invoked with a non-NULL MessagePumpDispatcher, MessageLoop
 // does not dispatch events (or invoke gtk_main_do_event), rather every event is
 // passed to Dispatcher's Dispatch method for dispatch. It is up to the
 // Dispatcher to dispatch, or not, the event. The platform specific
 // implementation of the class is in message_pump_gtk/message_pump_x.
 class MessagePumpDispatcher;
 
 // This class implements a base MessagePump needed for TYPE_UI MessageLoops on
 // platforms using GLib.
-class MessagePumpGlib : public MessagePump {
+class BASE_EXPORT MessagePumpGlib : public MessagePump {
  public:
   MessagePumpGlib();
 
   // Like MessagePump::Run, but events are routed through dispatcher.
   virtual void RunWithDispatcher(Delegate* delegate,
                                  MessagePumpDispatcher* dispatcher);
 
   // Internal methods used for processing the pump callbacks.  They are
   // public for simplicity but should not be used directly.  HandlePrepare
   // is called during the prepare step of glib, and returns a timeout that
@@ skipping 55 matching lines @@
 
   // List of observers.
   ObserverList<MessagePumpObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(MessagePumpGlib);
 };
 
 }  // namespace base
 
 #endif  // BASE_MESSAGE_PUMP_GLIB_H_