gtk: Some code cleanup for the message-pump.

base/message_loop/message_loop.h

Index: base/message_loop/message_loop.h
diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h
index f22c9044d1b9d30c4d9ff0b601eacd8aa4b765b2..0cb1801d3fb0b7b3c693529a1793097438dc6482 100644
--- a/base/message_loop/message_loop.h
+++ b/base/message_loop/message_loop.h
@@ -18,6 +18,8 @@
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/message_loop/message_loop_proxy_impl.h"
 #include "base/message_loop/message_pump.h"
+#include "base/message_loop/message_pump_dispatcher.h"
+#include "base/message_loop/message_pump_observer.h"
 #include "base/observer_list.h"
 #include "base/pending_task.h"
 #include "base/sequenced_task_runner_helpers.h"
@@ -40,6 +42,7 @@
 #elif defined(USE_OZONE) && !defined(OS_NACL)
 #include "base/message_loop/message_pump_ozone.h"
 #else
+#define USE_GTK_MESSAGE_PUMP
 #include "base/message_loop/message_pump_gtk.h"
 #endif
 
@@ -90,7 +93,10 @@ class WaitableEvent;
 class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
  public:
 
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(USE_GTK_MESSAGE_PUMP)
+  typedef void* Dispatcher;

[piman, 2013/09/05 18:12:43]

Do we need this, then? Can we remove it?

[sadrul, 2013/09/05 18:32:23]

Done (required a couple of additional ifdef changes for RunLoop).

+  typedef MessagePumpGdkObserver Observer;
+#elif !defined(OS_MACOSX) && !defined(OS_ANDROID)
   typedef MessagePumpDispatcher Dispatcher;
   typedef MessagePumpObserver Observer;
 #endif