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..606430be0c11f76de1102562f0471dbd1acf00ce 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"

[Nico, 2013/09/06 21:42:31]

Do you need the full includes? Forward declaring should be enough, no?

(as far as I can tell, this is just used for the typedef, and this compiles as
far as I can tell:

$ cat test.cc
class A;

class B {
  typedef A BA;
};

)

[sadrul, 2013/09/07 00:59:35]

Yep. Done.

 #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,9 @@ class WaitableEvent;
 class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
  public:
 
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(USE_GTK_MESSAGE_PUMP)
+  typedef MessagePumpGdkObserver Observer;
+#elif !defined(OS_MACOSX) && !defined(OS_ANDROID)
   typedef MessagePumpDispatcher Dispatcher;
   typedef MessagePumpObserver Observer;
 #endif